3c74dc9f4d
This patch adds two macros to declare per-type allocators: - JS_DECLARE_ALLOCATOR(TypeName) - JS_DEFINE_ALLOCATOR(TypeName) When used, they add a type-specific CellAllocator that the Heap will delegate allocation requests to. The result of this is that GC objects of the same type always end up within the same HeapBlock, drastically reducing the ability to perform type confusion attacks. It also improves HeapBlock utilization, since each block now has cells sized exactly to the type used within that block. (Previously we only had a handful of block sizes available, and most GC allocations ended up with a large amount of slack in their tails.) There is a small performance hit from this, but I'm sure we can make up for it elsewhere. Note that the old size-based allocators still exist, and we fall back to them for any type that doesn't have its own CellAllocator.
71 lines
2.9 KiB
C++
71 lines
2.9 KiB
C++
/*
|
|
* Copyright (c) 2020, Matthew Olsson <mattco@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <AK/Optional.h>
|
|
#include <AK/Result.h>
|
|
#include <LibJS/Runtime/Object.h>
|
|
#include <LibRegex/Regex.h>
|
|
|
|
namespace JS {
|
|
|
|
ThrowCompletionOr<NonnullGCPtr<RegExpObject>> regexp_create(VM&, Value pattern, Value flags);
|
|
ThrowCompletionOr<NonnullGCPtr<RegExpObject>> regexp_alloc(VM&, FunctionObject& new_target);
|
|
|
|
Result<regex::RegexOptions<ECMAScriptFlags>, DeprecatedString> regex_flags_from_string(StringView flags);
|
|
struct ParseRegexPatternError {
|
|
DeprecatedString error;
|
|
};
|
|
ErrorOr<DeprecatedString, ParseRegexPatternError> parse_regex_pattern(StringView pattern, bool unicode, bool unicode_sets);
|
|
ThrowCompletionOr<DeprecatedString> parse_regex_pattern(VM& vm, StringView pattern, bool unicode, bool unicode_sets);
|
|
|
|
class RegExpObject : public Object {
|
|
JS_OBJECT(RegExpObject, Object);
|
|
JS_DECLARE_ALLOCATOR(RegExpObject);
|
|
|
|
public:
|
|
// JS regexps are all 'global' by default as per our definition, but the "global" flag enables "stateful".
|
|
// FIXME: Enable 'BrowserExtended' only if in a browser context.
|
|
static constexpr regex::RegexOptions<ECMAScriptFlags> default_flags {
|
|
(regex::ECMAScriptFlags)regex::AllFlags::SingleMatch
|
|
| (regex::ECMAScriptFlags)regex::AllFlags::Global
|
|
| (regex::ECMAScriptFlags)regex::AllFlags::SkipTrimEmptyMatches
|
|
| regex::ECMAScriptFlags::BrowserExtended
|
|
};
|
|
|
|
static NonnullGCPtr<RegExpObject> create(Realm&);
|
|
static NonnullGCPtr<RegExpObject> create(Realm&, Regex<ECMA262> regex, DeprecatedString pattern, DeprecatedString flags);
|
|
|
|
ThrowCompletionOr<NonnullGCPtr<RegExpObject>> regexp_initialize(VM&, Value pattern, Value flags);
|
|
DeprecatedString escape_regexp_pattern() const;
|
|
|
|
virtual void initialize(Realm&) override;
|
|
virtual ~RegExpObject() override = default;
|
|
|
|
DeprecatedString const& pattern() const { return m_pattern; }
|
|
DeprecatedString const& flags() const { return m_flags; }
|
|
Regex<ECMA262> const& regex() { return *m_regex; }
|
|
Regex<ECMA262> const& regex() const { return *m_regex; }
|
|
Realm& realm() { return *m_realm; }
|
|
Realm const& realm() const { return *m_realm; }
|
|
bool legacy_features_enabled() const { return m_legacy_features_enabled; }
|
|
void set_legacy_features_enabled(bool legacy_features_enabled) { m_legacy_features_enabled = legacy_features_enabled; }
|
|
void set_realm(Realm& realm) { m_realm = &realm; }
|
|
|
|
private:
|
|
RegExpObject(Object& prototype);
|
|
RegExpObject(Regex<ECMA262> regex, DeprecatedString pattern, DeprecatedString flags, Object& prototype);
|
|
|
|
DeprecatedString m_pattern;
|
|
DeprecatedString m_flags;
|
|
bool m_legacy_features_enabled { false }; // [[LegacyFeaturesEnabled]]
|
|
// Note: This is initialized in RegExpAlloc, but will be non-null afterwards
|
|
GCPtr<Realm> m_realm; // [[Realm]]
|
|
Optional<Regex<ECMA262>> m_regex;
|
|
};
|
|
|
|
}
|