| Index: src/ast/ast.h
|
| diff --git a/src/ast/ast.h b/src/ast/ast.h
|
| index d565c8be402ac17df71c07cf69975bf396c7fe43..4be3331bd00ed633d8e80592ed6b2fb7663dfb65 100644
|
| --- a/src/ast/ast.h
|
| +++ b/src/ast/ast.h
|
| @@ -2672,21 +2672,6 @@ class FunctionLiteral final : public Expression {
|
| int yield_count() { return yield_count_; }
|
| void set_yield_count(int yield_count) { yield_count_ = yield_count; }
|
|
|
| - bool requires_class_field_init() {
|
| - return RequiresClassFieldInit::decode(bit_field_);
|
| - }
|
| - void set_requires_class_field_init(bool requires_class_field_init) {
|
| - bit_field_ =
|
| - RequiresClassFieldInit::update(bit_field_, requires_class_field_init);
|
| - }
|
| - bool is_class_field_initializer() {
|
| - return IsClassFieldInitializer::decode(bit_field_);
|
| - }
|
| - void set_is_class_field_initializer(bool is_class_field_initializer) {
|
| - bit_field_ =
|
| - IsClassFieldInitializer::update(bit_field_, is_class_field_initializer);
|
| - }
|
| -
|
| int return_position() {
|
| return std::max(start_position(), end_position() - (has_braces_ ? 1 : 0));
|
| }
|
| @@ -2721,15 +2706,13 @@ class FunctionLiteral final : public Expression {
|
| raw_inferred_name_(ast_value_factory->empty_string()),
|
| ast_properties_(zone),
|
| function_literal_id_(function_literal_id) {
|
| - bit_field_ |=
|
| - FunctionTypeBits::encode(function_type) | Pretenure::encode(false) |
|
| - HasDuplicateParameters::encode(has_duplicate_parameters ==
|
| - kHasDuplicateParameters) |
|
| - IsFunction::encode(is_function) |
|
| - RequiresClassFieldInit::encode(false) |
|
| - ShouldNotBeUsedOnceHintField::encode(false) |
|
| - DontOptimizeReasonField::encode(kNoReason) |
|
| - IsClassFieldInitializer::encode(false);
|
| + bit_field_ |= FunctionTypeBits::encode(function_type) |
|
| + Pretenure::encode(false) |
|
| + HasDuplicateParameters::encode(has_duplicate_parameters ==
|
| + kHasDuplicateParameters) |
|
| + IsFunction::encode(is_function) |
|
| + ShouldNotBeUsedOnceHintField::encode(false) |
|
| + DontOptimizeReasonField::encode(kNoReason);
|
| if (eager_compile_hint == kShouldEagerCompile) SetShouldEagerCompile();
|
| }
|
|
|
| @@ -2740,12 +2723,9 @@ class FunctionLiteral final : public Expression {
|
| class IsFunction : public BitField<bool, HasDuplicateParameters::kNext, 1> {};
|
| class ShouldNotBeUsedOnceHintField
|
| : public BitField<bool, IsFunction::kNext, 1> {};
|
| - class RequiresClassFieldInit
|
| - : public BitField<bool, ShouldNotBeUsedOnceHintField::kNext, 1> {};
|
| - class IsClassFieldInitializer
|
| - : public BitField<bool, RequiresClassFieldInit::kNext, 1> {};
|
| class DontOptimizeReasonField
|
| - : public BitField<BailoutReason, IsClassFieldInitializer::kNext, 8> {};
|
| + : public BitField<BailoutReason, ShouldNotBeUsedOnceHintField::kNext, 8> {
|
| + };
|
|
|
| int materialized_literal_count_;
|
| int expected_property_count_;
|
| @@ -2803,13 +2783,6 @@ class ClassLiteral final : public Expression {
|
| return HasStaticComputedNames::decode(bit_field_);
|
| }
|
|
|
| - VariableProxy* static_initializer_proxy() const {
|
| - return static_initializer_proxy_;
|
| - }
|
| - void set_static_initializer_proxy(VariableProxy* proxy) {
|
| - static_initializer_proxy_ = proxy;
|
| - }
|
| -
|
| // Object literals need one feedback slot for each non-trivial value, as well
|
| // as some slots for home objects.
|
| void AssignFeedbackVectorSlots(Isolate* isolate, FeedbackVectorSpec* spec,
|
| @@ -2835,8 +2808,7 @@ class ClassLiteral final : public Expression {
|
| class_variable_proxy_(class_variable_proxy),
|
| extends_(extends),
|
| constructor_(constructor),
|
| - properties_(properties),
|
| - static_initializer_proxy_(nullptr) {
|
| + properties_(properties) {
|
| bit_field_ |= HasNameStaticProperty::encode(has_name_static_property) |
|
| HasStaticComputedNames::encode(has_static_computed_names);
|
| }
|
| @@ -2848,7 +2820,6 @@ class ClassLiteral final : public Expression {
|
| Expression* extends_;
|
| FunctionLiteral* constructor_;
|
| ZoneList<Property*>* properties_;
|
| - VariableProxy* static_initializer_proxy_;
|
|
|
| class HasNameStaticProperty
|
| : public BitField<bool, Expression::kNextBitFieldIndex, 1> {};
|
|
|