[interpreter] Remove unused temp for class prototype

Bug: v8:12940 Change-Id: I2e12ba483f641a27fab623ae4d4f652aa8cdedff Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3699226 Reviewed-by: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Yolanda Chen <yolanda.chen@intel.com> Cr-Commit-Position: refs/heads/main@{#81121}
2022-06-11 02:57:16 +08:00 · 2022-06-11 02:57:16 +08:00 · 5ea696791f
commit 5ea696791f
parent 97953dd6e2
10 changed files with 96 additions and 148 deletions
--- a/src/interpreter/bytecode-generator.cc
+++ b/src/interpreter/bytecode-generator.cc
@ -2713,8 +2713,6 @@ void BytecodeGenerator::BuildClassLiteral(ClassLiteral* expr, Register name) {

    builder()->CallRuntime(Runtime::kDefineClass, args);
  }
-  Register prototype = register_allocator()->NewRegister();
-  builder()->StoreAccumulatorInRegister(prototype);

  // Assign to the home object variable. Accumulator already contains the
  // prototype.
--- a/test/unittests/interpreter/bytecode_expectations/ClassDeclarations.golden
+++ b/test/unittests/interpreter/bytecode_expectations/ClassDeclarations.golden
@ -14,7 +14,7 @@ snippet: "
 "
 frame size: 7
 parameter count: 1
-bytecode array length: 35
+bytecode array length: 34
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -28,7 +28,6 @@ bytecodes: [
                B(Star6),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(4),
-                B(Star3),
                B(PopContext), R(1),
                B(Mov), R(4), R(0),
                B(LdaUndefined),
@ -52,7 +51,7 @@ snippet: "
 "
 frame size: 7
 parameter count: 1
-bytecode array length: 35
+bytecode array length: 34
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -66,7 +65,6 @@ bytecodes: [
                B(Star6),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(4),
-                B(Star3),
                B(PopContext), R(1),
                B(Mov), R(4), R(0),
                B(LdaUndefined),
@ -92,7 +90,7 @@ snippet: "
 "
 frame size: 11
 parameter count: 1
-bytecode array length: 77
+bytecode array length: 76
 bytecodes: [
  /*   30 E> */ B(CreateFunctionContext), U8(0), U8(2),
                B(PushContext), R(1),
@ -122,7 +120,6 @@ bytecodes: [
                B(CreateClosure), U8(8), U8(2), U8(2),
                B(Star10),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(7),
-                B(Star4),
                B(PopContext), R(2),
                B(Mov), R(3), R(0),
                B(LdaUndefined),
@ -150,7 +147,7 @@ snippet: "
 "
 frame size: 7
 parameter count: 1
-bytecode array length: 44
+bytecode array length: 43
 bytecodes: [
  /*   30 E> */ B(CreateFunctionContext), U8(0), U8(1),
                B(PushContext), R(1),
@ -166,7 +163,6 @@ bytecodes: [
                B(Star4),
                B(Mov), R(3), R(5),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(3),
-                B(Star4),
                B(PopContext), R(2),
                B(Mov), R(5), R(0),
  /*   87 S> */ B(Ldar), R(0),
@ -189,7 +185,7 @@ snippet: "
 "
 frame size: 7
 parameter count: 1
-bytecode array length: 60
+bytecode array length: 58
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -201,7 +197,6 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(PopContext), R(1),
                B(CreateBlockContext), U8(3),
                B(PushContext), R(1),
@ -215,7 +210,6 @@ bytecodes: [
                B(Star6),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(4),
-                B(Star3),
                B(PopContext), R(1),
                B(Mov), R(4), R(0),
                B(LdaUndefined),
--- a/test/unittests/interpreter/bytecode_expectations/Modules.golden
+++ b/test/unittests/interpreter/bytecode_expectations/Modules.golden
@ -330,7 +330,7 @@ snippet: "
 "
 frame size: 6
 parameter count: 1
-bytecode array length: 82
+bytecode array length: 81
 bytecodes: [
                B(SwitchOnGeneratorState), R(0), U8(0), U8(1),
                B(Mov), R(closure), R(2),
@ -360,7 +360,6 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(Ldar), R(4),
                B(StaModuleVariable), I8(1), U8(0),
                B(Ldar), R(1),
--- a/test/unittests/interpreter/bytecode_expectations/NewAndSpread.golden
+++ b/test/unittests/interpreter/bytecode_expectations/NewAndSpread.golden
@ -12,7 +12,7 @@ snippet: "
 "
 frame size: 6
 parameter count: 1
-bytecode array length: 42
+bytecode array length: 41
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -24,7 +24,6 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(PopContext), R(1),
                B(Mov), R(4), R(0),
  /*   89 S> */ B(CreateArrayLiteral), U8(3), U8(0), U8(37),
@ -50,7 +49,7 @@ snippet: "
 "
 frame size: 6
 parameter count: 1
-bytecode array length: 44
+bytecode array length: 43
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -62,7 +61,6 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(PopContext), R(1),
                B(Mov), R(4), R(0),
  /*   89 S> */ B(LdaZero),
@ -90,7 +88,7 @@ snippet: "
 "
 frame size: 7
 parameter count: 1
-bytecode array length: 104
+bytecode array length: 103
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -102,7 +100,6 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(PopContext), R(1),
                B(Mov), R(4), R(0),
  /*   89 S> */ B(CreateArrayLiteral), U8(3), U8(0), U8(37),
--- a/test/unittests/interpreter/bytecode_expectations/PrivateAccessorDeclaration.golden
+++ b/test/unittests/interpreter/bytecode_expectations/PrivateAccessorDeclaration.golden
@ -16,7 +16,7 @@ snippet: "
 "
 frame size: 6
 parameter count: 1
-bytecode array length: 57
+bytecode array length: 56
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -32,12 +32,11 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(CreateClosure), U8(4), U8(1), U8(2),
-                B(Star4),
+                B(Star3),
                B(CreateClosure), U8(5), U8(2), U8(2),
-                B(Star5),
-                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(4), U8(2),
+                B(Star4),
+                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(3), U8(2),
                B(StaCurrentContextSlot), U8(2),
                B(PopContext), R(1),
                B(Mov), R(2), R(0),
@ -65,7 +64,7 @@ snippet: "
 "
 frame size: 6
 parameter count: 1
-bytecode array length: 54
+bytecode array length: 53
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -81,12 +80,11 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(CreateClosure), U8(4), U8(1), U8(2),
-                B(Star4),
+                B(Star3),
                B(LdaNull),
-                B(Star5),
-                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(4), U8(2),
+                B(Star4),
+                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(3), U8(2),
                B(StaCurrentContextSlot), U8(2),
                B(PopContext), R(1),
                B(Mov), R(2), R(0),
@ -113,7 +111,7 @@ snippet: "
 "
 frame size: 6
 parameter count: 1
-bytecode array length: 54
+bytecode array length: 53
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -129,12 +127,11 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(LdaNull),
-                B(Star4),
+                B(Star3),
                B(CreateClosure), U8(4), U8(1), U8(2),
-                B(Star5),
-                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(4), U8(2),
+                B(Star4),
+                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(3), U8(2),
                B(StaCurrentContextSlot), U8(2),
                B(PopContext), R(1),
                B(Mov), R(2), R(0),
@ -167,7 +164,7 @@ snippet: "
 "
 frame size: 7
 parameter count: 1
-bytecode array length: 113
+bytecode array length: 111
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(2),
@ -183,12 +180,11 @@ bytecodes: [
                B(Star4),
                B(Mov), R(3), R(5),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(3),
-                B(Star4),
                B(CreateClosure), U8(4), U8(1), U8(2),
-                B(Star5),
+                B(Star4),
                B(CreateClosure), U8(5), U8(2), U8(2),
-                B(Star6),
-                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(5), U8(2),
+                B(Star5),
+                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(4), U8(2),
                B(StaCurrentContextSlot), U8(2),
                B(PopContext), R(2),
                B(Mov), R(3), R(0),
@ -205,12 +201,11 @@ bytecodes: [
                B(Mov), R(3), R(5),
                B(Mov), R(0), R(6),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(3),
-                B(Star4),
                B(CreateClosure), U8(10), U8(4), U8(2),
-                B(Star5),
+                B(Star4),
                B(CreateClosure), U8(11), U8(5), U8(2),
-                B(Star6),
-                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(5), U8(2),
+                B(Star5),
+                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(4), U8(2),
                B(StaCurrentContextSlot), U8(2),
                B(PopContext), R(2),
                B(Mov), R(3), R(1),
@ -246,7 +241,7 @@ snippet: "
 "
 frame size: 8
 parameter count: 1
-bytecode array length: 101
+bytecode array length: 99
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(2),
@ -260,7 +255,6 @@ bytecodes: [
                B(Star7),
                B(Mov), R(3), R(5),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(4),
-                B(Star4),
                B(PopContext), R(2),
                B(Mov), R(5), R(0),
                B(CreateBlockContext), U8(4),
@ -277,14 +271,13 @@ bytecodes: [
                B(Mov), R(0), R(6),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(3),
                B(StaCurrentContextSlot), U8(4),
-                B(Star4),
                B(Ldar), R(5),
                B(StaCurrentContextSlot), U8(5),
                B(CreateClosure), U8(8), U8(3), U8(2),
-                B(Star5),
+                B(Star4),
                B(LdaNull),
-                B(Star6),
-                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(5), U8(2),
+                B(Star5),
+                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(4), U8(2),
                B(StaCurrentContextSlot), U8(2),
                B(PopContext), R(2),
                B(Mov), R(3), R(1),
@ -319,7 +312,7 @@ snippet: "
 "
 frame size: 8
 parameter count: 1
-bytecode array length: 101
+bytecode array length: 99
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(2),
@ -333,7 +326,6 @@ bytecodes: [
                B(Star7),
                B(Mov), R(3), R(5),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(4),
-                B(Star4),
                B(PopContext), R(2),
                B(Mov), R(5), R(0),
                B(CreateBlockContext), U8(4),
@ -350,14 +342,13 @@ bytecodes: [
                B(Mov), R(0), R(6),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(3),
                B(StaCurrentContextSlot), U8(4),
-                B(Star4),
                B(Ldar), R(5),
                B(StaCurrentContextSlot), U8(5),
                B(LdaNull),
-                B(Star5),
+                B(Star4),
                B(CreateClosure), U8(8), U8(3), U8(2),
-                B(Star6),
-                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(5), U8(2),
+                B(Star5),
+                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(4), U8(2),
                B(StaCurrentContextSlot), U8(2),
                B(PopContext), R(2),
                B(Mov), R(3), R(1),
--- a/test/unittests/interpreter/bytecode_expectations/PrivateClassFields.golden
+++ b/test/unittests/interpreter/bytecode_expectations/PrivateClassFields.golden
@ -24,7 +24,7 @@ snippet: "
 "
 frame size: 7
 parameter count: 1
-bytecode array length: 116
+bytecode array length: 114
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(2),
@ -42,12 +42,11 @@ bytecodes: [
                B(Star4),
                B(Mov), R(3), R(5),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(3),
-                B(Star4),
                B(CreateClosure), U8(4), U8(1), U8(2),
-                B(Star5),
+                B(Star4),
                B(SetNamedProperty), R(3), U8(5), U8(0),
                B(PopContext), R(2),
-                B(Mov), R(3), R(0),
+                B(Mov), R(5), R(0),
                B(CreateBlockContext), U8(6),
                B(PushContext), R(2),
                B(LdaConstant), U8(2),
@ -64,12 +63,11 @@ bytecodes: [
                B(Star4),
                B(Mov), R(3), R(5),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(3),
-                B(Star4),
                B(CreateClosure), U8(9), U8(3), U8(2),
-                B(Star5),
+                B(Star4),
                B(SetNamedProperty), R(3), U8(5), U8(2),
                B(PopContext), R(2),
-                B(Mov), R(3), R(1),
+                B(Mov), R(5), R(1),
  /*  136 S> */ B(Ldar), R(0),
  /*  136 E> */ B(Construct), R(0), R(0), U8(0), U8(4),
  /*  145 S> */ B(Ldar), R(1),
@ -129,7 +127,7 @@ snippet: "
 "
 frame size: 12
 parameter count: 1
-bytecode array length: 237
+bytecode array length: 232
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(3),
@ -147,7 +145,6 @@ bytecodes: [
                B(Star9),
                B(Mov), R(8), R(10),
                B(CallRuntime), U16(Runtime::kDefineClass), R(9), U8(3),
-                B(Star9),
                B(CreateClosure), U8(5), U8(1), U8(2),
                B(Star4),
                B(LdaConstant), U8(1),
@ -155,12 +152,11 @@ bytecodes: [
                B(Mov), R(4), R(6),
                B(Mov), R(10), R(7),
                B(CallRuntime), U16(Runtime::kDefineClass), R(5), U8(3),
-                B(Star5),
                B(CreateClosure), U8(6), U8(2), U8(2),
-                B(Star6),
+                B(Star5),
                B(SetNamedProperty), R(4), U8(7), U8(0),
                B(PopContext), R(3),
-                B(Mov), R(4), R(0),
+                B(Mov), R(6), R(0),
                B(CreateBlockContext), U8(8),
                B(PushContext), R(3),
                B(LdaConstant), U8(2),
@ -183,7 +179,6 @@ bytecodes: [
                B(Star9),
                B(Mov), R(8), R(10),
                B(CallRuntime), U16(Runtime::kDefineClass), R(9), U8(3),
-                B(Star9),
                B(CreateClosure), U8(13), U8(4), U8(2),
                B(Star4),
                B(LdaConstant), U8(9),
@ -195,12 +190,11 @@ bytecodes: [
                B(Mov), R(4), R(6),
                B(Mov), R(10), R(7),
                B(CallRuntime), U16(Runtime::kDefineClass), R(5), U8(5),
-                B(Star5),
                B(CreateClosure), U8(16), U8(7), U8(2),
-                B(Star6),
+                B(Star5),
                B(SetNamedProperty), R(4), U8(7), U8(2),
                B(PopContext), R(3),
-                B(Mov), R(4), R(1),
+                B(Mov), R(6), R(1),
                B(CreateBlockContext), U8(17),
                B(PushContext), R(3),
                B(LdaConstant), U8(2),
@ -216,12 +210,11 @@ bytecodes: [
                B(Mov), R(4), R(6),
                B(Mov), R(1), R(7),
                B(CallRuntime), U16(Runtime::kDefineClass), R(5), U8(3),
-                B(Star5),
                B(CreateClosure), U8(20), U8(9), U8(2),
-                B(Star6),
+                B(Star5),
                B(SetNamedProperty), R(4), U8(7), U8(4),
                B(PopContext), R(3),
-                B(Mov), R(4), R(2),
+                B(Mov), R(6), R(2),
  /*  430 S> */ B(Ldar), R(0),
  /*  430 E> */ B(Construct), R(0), R(0), U8(0), U8(6),
  /*  439 S> */ B(Ldar), R(1),
--- a/test/unittests/interpreter/bytecode_expectations/PrivateMethodDeclaration.golden
+++ b/test/unittests/interpreter/bytecode_expectations/PrivateMethodDeclaration.golden
@ -15,7 +15,7 @@ snippet: "
 "
 frame size: 6
 parameter count: 1
-bytecode array length: 46
+bytecode array length: 45
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -33,7 +33,6 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(PopContext), R(1),
                B(Mov), R(4), R(0),
                B(LdaUndefined),
@ -62,7 +61,7 @@ snippet: "
 "
 frame size: 7
 parameter count: 1
-bytecode array length: 91
+bytecode array length: 89
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(2),
@ -80,7 +79,6 @@ bytecodes: [
                B(Star4),
                B(Mov), R(3), R(5),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(3),
-                B(Star4),
                B(PopContext), R(2),
                B(Mov), R(5), R(0),
                B(CreateBlockContext), U8(5),
@ -98,7 +96,6 @@ bytecodes: [
                B(Mov), R(3), R(5),
                B(Mov), R(0), R(6),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(3),
-                B(Star4),
                B(PopContext), R(2),
                B(Mov), R(5), R(1),
                B(LdaUndefined),
@ -130,7 +127,7 @@ snippet: "
 "
 frame size: 8
 parameter count: 1
-bytecode array length: 84
+bytecode array length: 82
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(2),
@ -144,7 +141,6 @@ bytecodes: [
                B(Star7),
                B(Mov), R(3), R(5),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(4),
-                B(Star4),
                B(PopContext), R(2),
                B(Mov), R(5), R(0),
                B(CreateBlockContext), U8(4),
@ -163,7 +159,6 @@ bytecodes: [
                B(Mov), R(0), R(6),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(3),
                B(StaCurrentContextSlot), U8(4),
-                B(Star4),
                B(Ldar), R(5),
                B(StaCurrentContextSlot), U8(5),
                B(PopContext), R(2),
--- a/test/unittests/interpreter/bytecode_expectations/PublicClassFields.golden
+++ b/test/unittests/interpreter/bytecode_expectations/PublicClassFields.golden
@ -23,7 +23,7 @@ snippet: "
 "
 frame size: 8
 parameter count: 1
-bytecode array length: 106
+bytecode array length: 104
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(2),
@ -40,12 +40,11 @@ bytecodes: [
                B(Star7),
                B(Mov), R(3), R(5),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(4),
-                B(Star4),
                B(CreateClosure), U8(4), U8(1), U8(2),
-                B(Star5),
+                B(Star4),
                B(SetNamedProperty), R(3), U8(5), U8(0),
                B(PopContext), R(2),
-                B(Mov), R(3), R(0),
+                B(Mov), R(5), R(0),
                B(CreateBlockContext), U8(6),
                B(PushContext), R(2),
                B(LdaTheHole),
@ -61,12 +60,11 @@ bytecodes: [
                B(Star7),
                B(Mov), R(3), R(5),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(4),
-                B(Star4),
                B(CreateClosure), U8(9), U8(3), U8(2),
-                B(Star5),
+                B(Star4),
                B(SetNamedProperty), R(3), U8(5), U8(2),
                B(PopContext), R(2),
-                B(Mov), R(3), R(1),
+                B(Mov), R(5), R(1),
  /*  120 S> */ B(Ldar), R(0),
  /*  120 E> */ B(Construct), R(0), R(0), U8(0), U8(4),
  /*  129 S> */ B(Ldar), R(1),
@ -121,7 +119,7 @@ snippet: "
 "
 frame size: 12
 parameter count: 1
-bytecode array length: 204
+bytecode array length: 199
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(3),
@ -135,7 +133,6 @@ bytecodes: [
                B(Star9),
                B(Mov), R(8), R(10),
                B(CallRuntime), U16(Runtime::kDefineClass), R(9), U8(3),
-                B(Star9),
                B(CreateClosure), U8(4), U8(1), U8(2),
                B(Star4),
                B(LdaConstant), U8(1),
@ -146,12 +143,11 @@ bytecodes: [
                B(Mov), R(4), R(6),
                B(Mov), R(10), R(7),
                B(CallRuntime), U16(Runtime::kDefineClass), R(5), U8(4),
-                B(Star5),
                B(CreateClosure), U8(6), U8(2), U8(2),
-                B(Star6),
+                B(Star5),
                B(SetNamedProperty), R(4), U8(7), U8(0),
                B(PopContext), R(3),
-                B(Mov), R(4), R(0),
+                B(Mov), R(6), R(0),
                B(CreateBlockContext), U8(8),
                B(PushContext), R(3),
                B(LdaTheHole),
@ -164,7 +160,6 @@ bytecodes: [
                B(Star9),
                B(Mov), R(8), R(10),
                B(CallRuntime), U16(Runtime::kDefineClass), R(9), U8(3),
-                B(Star9),
                B(CreateClosure), U8(12), U8(4), U8(2),
                B(Star4),
                B(LdaConstant), U8(9),
@ -177,12 +172,11 @@ bytecodes: [
                B(Mov), R(4), R(6),
                B(Mov), R(10), R(7),
                B(CallRuntime), U16(Runtime::kDefineClass), R(5), U8(5),
-                B(Star5),
                B(CreateClosure), U8(14), U8(6), U8(2),
-                B(Star6),
+                B(Star5),
                B(SetNamedProperty), R(4), U8(7), U8(2),
                B(PopContext), R(3),
-                B(Mov), R(4), R(1),
+                B(Mov), R(6), R(1),
                B(CreateBlockContext), U8(15),
                B(PushContext), R(3),
                B(LdaTheHole),
@ -197,12 +191,11 @@ bytecodes: [
                B(Mov), R(4), R(6),
                B(Mov), R(1), R(7),
                B(CallRuntime), U16(Runtime::kDefineClass), R(5), U8(4),
-                B(Star5),
                B(CreateClosure), U8(18), U8(8), U8(2),
-                B(Star6),
+                B(Star5),
                B(SetNamedProperty), R(4), U8(7), U8(4),
                B(PopContext), R(3),
-                B(Mov), R(4), R(2),
+                B(Mov), R(6), R(2),
  /*  329 S> */ B(Ldar), R(0),
  /*  329 E> */ B(Construct), R(0), R(0), U8(0), U8(6),
  /*  338 S> */ B(Ldar), R(1),
--- a/test/unittests/interpreter/bytecode_expectations/StaticClassFields.golden
+++ b/test/unittests/interpreter/bytecode_expectations/StaticClassFields.golden
@ -27,7 +27,7 @@ snippet: "
 "
 frame size: 9
 parameter count: 1
-bytecode array length: 168
+bytecode array length: 166
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(2),
@ -54,13 +54,12 @@ bytecodes: [
                B(Ldar), R(8),
                B(StaCurrentContextSlot), U8(3),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(5),
-                B(Star4),
                B(CreateClosure), U8(6), U8(1), U8(2),
-                B(Star5),
+                B(Star4),
                B(SetNamedProperty), R(3), U8(7), U8(1),
                B(CreateClosure), U8(8), U8(2), U8(2),
-                B(Star7),
-                B(CallProperty0), R(7), R(3), U8(3),
+                B(Star6),
+                B(CallProperty0), R(6), R(3), U8(3),
                B(PopContext), R(2),
                B(Mov), R(3), R(0),
                B(CreateBlockContext), U8(9),
@ -88,13 +87,12 @@ bytecodes: [
                B(Ldar), R(8),
                B(StaCurrentContextSlot), U8(3),
                B(CallRuntime), U16(Runtime::kDefineClass), R(4), U8(5),
-                B(Star4),
                B(CreateClosure), U8(12), U8(4), U8(2),
-                B(Star5),
+                B(Star4),
                B(SetNamedProperty), R(3), U8(7), U8(5),
                B(CreateClosure), U8(13), U8(5), U8(2),
-                B(Star7),
-                B(CallProperty0), R(7), R(3), U8(7),
+                B(Star6),
+                B(CallProperty0), R(6), R(3), U8(7),
                B(PopContext), R(2),
                B(Mov), R(3), R(1),
  /*  197 S> */ B(Ldar), R(0),
@ -161,7 +159,7 @@ snippet: "
 "
 frame size: 12
 parameter count: 1
-bytecode array length: 303
+bytecode array length: 298
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(3),
@ -177,7 +175,6 @@ bytecodes: [
                B(Star9),
                B(Mov), R(8), R(10),
                B(CallRuntime), U16(Runtime::kDefineClass), R(9), U8(3),
-                B(Star9),
                B(CreateClosure), U8(4), U8(1), U8(2),
                B(Star4),
                B(LdaConstant), U8(1),
@ -196,13 +193,12 @@ bytecodes: [
                B(Ldar), R(9),
                B(StaCurrentContextSlot), U8(3),
                B(CallRuntime), U16(Runtime::kDefineClass), R(5), U8(5),
-                B(Star5),
                B(CreateClosure), U8(8), U8(2), U8(2),
-                B(Star6),
+                B(Star5),
                B(SetNamedProperty), R(4), U8(9), U8(1),
                B(CreateClosure), U8(10), U8(3), U8(2),
-                B(Star8),
-                B(CallProperty0), R(8), R(4), U8(3),
+                B(Star7),
+                B(CallProperty0), R(7), R(4), U8(3),
                B(PopContext), R(3),
                B(Mov), R(4), R(0),
                B(CreateBlockContext), U8(11),
@ -219,7 +215,6 @@ bytecodes: [
                B(Star9),
                B(Mov), R(8), R(10),
                B(CallRuntime), U16(Runtime::kDefineClass), R(9), U8(3),
-                B(Star9),
                B(CreateClosure), U8(15), U8(5), U8(2),
                B(Star4),
                B(LdaConstant), U8(12),
@ -231,8 +226,8 @@ bytecodes: [
                B(Star9),
                B(LdaConstant), U8(7),
                B(TestEqualStrict), R(9), U8(0),
-                B(Mov), R(4), R(6),
                B(Mov), R(10), R(7),
+                B(Mov), R(4), R(6),
                B(JumpIfFalse), U8(7),
                B(CallRuntime), U16(Runtime::kThrowStaticPrototypeError), R(0), U8(0),
                B(Ldar), R(9),
@ -240,13 +235,12 @@ bytecodes: [
                B(CreateClosure), U8(16), U8(6), U8(2),
                B(Star10),
                B(CallRuntime), U16(Runtime::kDefineClass), R(5), U8(6),
-                B(Star5),
                B(CreateClosure), U8(17), U8(7), U8(2),
-                B(Star6),
+                B(Star5),
                B(SetNamedProperty), R(4), U8(9), U8(5),
                B(CreateClosure), U8(18), U8(8), U8(2),
-                B(Star8),
-                B(CallProperty0), R(8), R(4), U8(7),
+                B(Star7),
+                B(CallProperty0), R(7), R(4), U8(7),
                B(PopContext), R(3),
                B(Mov), R(4), R(1),
                B(CreateBlockContext), U8(19),
@ -266,23 +260,22 @@ bytecodes: [
                B(Star9),
                B(LdaConstant), U8(7),
                B(TestEqualStrict), R(9), U8(0),
-                B(Mov), R(4), R(6),
                B(Mov), R(1), R(7),
+                B(Mov), R(4), R(6),
                B(JumpIfFalse), U8(7),
                B(CallRuntime), U16(Runtime::kThrowStaticPrototypeError), R(0), U8(0),
                B(Ldar), R(9),
                B(StaCurrentContextSlot), U8(3),
                B(CallRuntime), U16(Runtime::kDefineClass), R(5), U8(5),
                B(StaCurrentContextSlot), U8(4),
-                B(Star5),
                B(Ldar), R(4),
                B(StaCurrentContextSlot), U8(5),
                B(CreateClosure), U8(22), U8(10), U8(2),
-                B(Star6),
+                B(Star5),
                B(SetNamedProperty), R(4), U8(9), U8(9),
                B(CreateClosure), U8(23), U8(11), U8(2),
-                B(Star8),
-                B(CallProperty0), R(8), R(4), U8(11),
+                B(Star7),
+                B(CallProperty0), R(7), R(4), U8(11),
                B(PopContext), R(3),
                B(Mov), R(4), R(2),
  /*  456 S> */ B(Ldar), R(0),
--- a/test/unittests/interpreter/bytecode_expectations/StaticPrivateMethodDeclaration.golden
+++ b/test/unittests/interpreter/bytecode_expectations/StaticPrivateMethodDeclaration.golden
@ -15,7 +15,7 @@ snippet: "
 "
 frame size: 6
 parameter count: 1
-bytecode array length: 36
+bytecode array length: 35
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -29,7 +29,6 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(PopContext), R(1),
                B(Mov), R(4), R(0),
                B(LdaUndefined),
@ -54,7 +53,7 @@ snippet: "
 "
 frame size: 6
 parameter count: 1
-bytecode array length: 44
+bytecode array length: 43
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -66,12 +65,11 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(CreateClosure), U8(3), U8(1), U8(2),
-                B(Star4),
+                B(Star3),
                B(LdaNull),
-                B(Star5),
-                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(4), U8(2),
+                B(Star4),
+                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(3), U8(2),
                B(StaCurrentContextSlot), U8(2),
                B(PopContext), R(1),
                B(Mov), R(2), R(0),
@ -97,7 +95,7 @@ snippet: "
 "
 frame size: 6
 parameter count: 1
-bytecode array length: 44
+bytecode array length: 43
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -109,12 +107,11 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(LdaNull),
-                B(Star4),
+                B(Star3),
                B(CreateClosure), U8(3), U8(1), U8(2),
-                B(Star5),
-                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(4), U8(2),
+                B(Star4),
+                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(3), U8(2),
                B(StaCurrentContextSlot), U8(2),
                B(PopContext), R(1),
                B(Mov), R(2), R(0),
@ -141,7 +138,7 @@ snippet: "
 "
 frame size: 6
 parameter count: 1
-bytecode array length: 47
+bytecode array length: 46
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -153,12 +150,11 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(CreateClosure), U8(3), U8(1), U8(2),
-                B(Star4),
+                B(Star3),
                B(CreateClosure), U8(4), U8(2), U8(2),
-                B(Star5),
-                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(4), U8(2),
+                B(Star4),
+                B(CallRuntime), U16(Runtime::kCreatePrivateAccessors), R(3), U8(2),
                B(StaCurrentContextSlot), U8(2),
                B(PopContext), R(1),
                B(Mov), R(2), R(0),
@ -186,7 +182,7 @@ snippet: "
 "
 frame size: 6
 parameter count: 1
-bytecode array length: 52
+bytecode array length: 51
 bytecodes: [
                B(CreateBlockContext), U8(0),
                B(PushContext), R(1),
@ -206,7 +202,6 @@ bytecodes: [
                B(Star3),
                B(Mov), R(2), R(4),
                B(CallRuntime), U16(Runtime::kDefineClass), R(3), U8(3),
-                B(Star3),
                B(PopContext), R(1),
                B(Mov), R(4), R(0),
                B(LdaUndefined),