From b9c9315bcb41ac785229388186e3c054bae6b4e6 Mon Sep 17 00:00:00 2001
From: Simon Wanner <simon+git@skyrising.xyz>
Date: Sun, 5 Nov 2023 11:21:32 +0100
Subject: [PATCH] LibJS: Assign getter/setter function names as early as
 possible

In case of {get func() {}, set func() {}} we were wrongly setting the
function name to 'func' and then later trying to replace an empty name
with 'get func'/'set func' which failed.

Instead, set the name to 'get func'/'set func' right away.
The code in put_by_property_key is kept, for when that is called
by put_by_value.
---
 Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp | 7 ++++++-
 Userland/Libraries/LibJS/Tests/object-basic.js   | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp b/Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp
index e0711f213d..d4d97e52a4 100644
--- a/Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp
+++ b/Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp
@@ -976,7 +976,12 @@ Bytecode::CodeGenerationErrorOr<void> ObjectExpression::generate_bytecode(Byteco
             if (property_kind == Bytecode::Op::PropertyKind::ProtoSetter) {
                 TRY(property->value().generate_bytecode(generator));
             } else if (property_kind != Bytecode::Op::PropertyKind::Spread) {
-                auto name = generator.intern_identifier(string_literal.value());
+                DeprecatedString identifier = string_literal.value();
+                if (property_kind == Bytecode::Op::PropertyKind::Getter)
+                    identifier = DeprecatedString::formatted("get {}", identifier);
+                else if (property_kind == Bytecode::Op::PropertyKind::Setter)
+                    identifier = DeprecatedString::formatted("set {}", identifier);
+                auto name = generator.intern_identifier(identifier);
                 TRY(generator.emit_named_evaluation_if_anonymous_function(property->value(), name));
             }
 
diff --git a/Userland/Libraries/LibJS/Tests/object-basic.js b/Userland/Libraries/LibJS/Tests/object-basic.js
index f04b87ffcf..879a0a114a 100644
--- a/Userland/Libraries/LibJS/Tests/object-basic.js
+++ b/Userland/Libraries/LibJS/Tests/object-basic.js
@@ -221,13 +221,13 @@ describe("naming of anon functions", () => {
         expect({ func() {} }.func.name).toBe("func");
     });
 
-    test.xfail("getter has name", () => {
+    test("getter has name", () => {
         expect(Object.getOwnPropertyDescriptor({ get func() {} }, "func").get.name).toBe(
             "get func"
         );
     });
 
-    test.xfail("setter has name", () => {
+    test("setter has name", () => {
         expect(Object.getOwnPropertyDescriptor({ set func(v) {} }, "func").set.name).toBe(
             "set func"
         );