diff --git a/Userland/Libraries/LibJS/AST.cpp b/Userland/Libraries/LibJS/AST.cpp index 950925f3258..d642400b99c 100644 --- a/Userland/Libraries/LibJS/AST.cpp +++ b/Userland/Libraries/LibJS/AST.cpp @@ -201,13 +201,13 @@ ThrowCompletionOr ClassMethod::class_element_evaluatio switch (kind()) { case Kind::Method: set_function_name(); - return ClassValue { PrivateElement { private_name, PrivateElement::Kind::Method, make_handle(method_value) } }; + return ClassValue { PrivateElement { private_name, PrivateElement::Kind::Method, method_value } }; case Kind::Getter: set_function_name("get"); - return ClassValue { PrivateElement { private_name, PrivateElement::Kind::Accessor, make_handle(Value(Accessor::create(vm, &method_function, nullptr))) } }; + return ClassValue { PrivateElement { private_name, PrivateElement::Kind::Accessor, Value(Accessor::create(vm, &method_function, nullptr)) } }; case Kind::Setter: set_function_name("set"); - return ClassValue { PrivateElement { private_name, PrivateElement::Kind::Accessor, make_handle(Value(Accessor::create(vm, nullptr, &method_function))) } }; + return ClassValue { PrivateElement { private_name, PrivateElement::Kind::Accessor, Value(Accessor::create(vm, nullptr, &method_function)) } }; default: VERIFY_NOT_REACHED(); } @@ -392,11 +392,11 @@ ThrowCompletionOr ClassExpression::create_class_const if (existing.key == private_element.key) { VERIFY(existing.kind == PrivateElement::Kind::Accessor); VERIFY(private_element.kind == PrivateElement::Kind::Accessor); - auto& accessor = private_element.value.value().as_accessor(); + auto& accessor = private_element.value.as_accessor(); if (!accessor.getter()) - existing.value.value().as_accessor().set_setter(accessor.setter()); + existing.value.as_accessor().set_setter(accessor.setter()); else - existing.value.value().as_accessor().set_getter(accessor.getter()); + existing.value.as_accessor().set_getter(accessor.getter()); added_to_existing = true; } } diff --git a/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.cpp b/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.cpp index 2ecbe8235f4..e68630b6e76 100644 --- a/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.cpp +++ b/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.cpp @@ -538,6 +538,9 @@ void ECMAScriptFunctionObject::visit_edges(Visitor& visitor) visitor.visit(property_key_ptr->as_symbol()); } + for (auto& private_element : m_private_methods) + visitor.visit(private_element.value); + m_script_or_module.visit( [](Empty) {}, [&](auto& script_or_module) { diff --git a/Userland/Libraries/LibJS/Runtime/Object.cpp b/Userland/Libraries/LibJS/Runtime/Object.cpp index 6377430447d..4b39013a96b 100644 --- a/Userland/Libraries/LibJS/Runtime/Object.cpp +++ b/Userland/Libraries/LibJS/Runtime/Object.cpp @@ -519,7 +519,7 @@ ThrowCompletionOr Object::private_field_add(PrivateName const& name, Value m_private_elements = make>(); // 4. Append PrivateElement { [[Key]]: P, [[Kind]]: field, [[Value]]: value } to O.[[PrivateElements]]. - m_private_elements->empend(name, PrivateElement::Kind::Field, make_handle(value)); + m_private_elements->empend(name, PrivateElement::Kind::Field, value); // 5. Return unused. return {}; @@ -570,14 +570,14 @@ ThrowCompletionOr Object::private_get(PrivateName const& name) // 3. If entry.[[Kind]] is either field or method, then if (entry->kind != PrivateElement::Kind::Accessor) { // a. Return entry.[[Value]]. - return value.value(); + return value; } // Assert: entry.[[Kind]] is accessor. - VERIFY(value.value().is_accessor()); + VERIFY(value.is_accessor()); // 6. Let getter be entry.[[Get]]. - auto* getter = value.value().as_accessor().getter(); + auto* getter = value.as_accessor().getter(); // 5. If entry.[[Get]] is undefined, throw a TypeError exception. if (!getter) @@ -602,7 +602,7 @@ ThrowCompletionOr Object::private_set(PrivateName const& name, Value value // 3. If entry.[[Kind]] is field, then if (entry->kind == PrivateElement::Kind::Field) { // a. Set entry.[[Value]] to value. - entry->value = make_handle(value); + entry->value = value; return {}; } // 4. Else if entry.[[Kind]] is method, then @@ -617,10 +617,10 @@ ThrowCompletionOr Object::private_set(PrivateName const& name, Value value VERIFY(entry->kind == PrivateElement::Kind::Accessor); auto& accessor = entry->value; - VERIFY(accessor.value().is_accessor()); + VERIFY(accessor.is_accessor()); // c. Let setter be entry.[[Set]]. - auto* setter = accessor.value().as_accessor().setter(); + auto* setter = accessor.as_accessor().setter(); // b. If entry.[[Set]] is undefined, throw a TypeError exception. if (!setter) @@ -1386,6 +1386,11 @@ void Object::visit_edges(Cell::Visitor& visitor) m_indexed_properties.for_each_value([&visitor](auto& value) { visitor.visit(value); }); + + if (m_private_elements) { + for (auto& private_element : *m_private_elements) + visitor.visit(private_element.value); + } } // 7.1.1.1 OrdinaryToPrimitive ( O, hint ), https://tc39.es/ecma262/#sec-ordinarytoprimitive diff --git a/Userland/Libraries/LibJS/Runtime/Object.h b/Userland/Libraries/LibJS/Runtime/Object.h index 9b13dc1d2d0..a09405e14f7 100644 --- a/Userland/Libraries/LibJS/Runtime/Object.h +++ b/Userland/Libraries/LibJS/Runtime/Object.h @@ -37,7 +37,7 @@ struct PrivateElement { PrivateName key; Kind kind { Kind::Field }; - Handle value; + Value value; }; // Non-standard: This is information optionally returned by object property access functions.