| Index: test/cctest/interpreter/bytecode_expectations/Generators.golden
|
| diff --git a/test/cctest/interpreter/bytecode_expectations/Generators.golden b/test/cctest/interpreter/bytecode_expectations/Generators.golden
|
| index e337ef8979b590b1bb242d8036a5861e4b16a850..51660a65b647af444b2cc84af7a635f4cf15e305 100644
|
| --- a/test/cctest/interpreter/bytecode_expectations/Generators.golden
|
| +++ b/test/cctest/interpreter/bytecode_expectations/Generators.golden
|
| @@ -16,7 +16,7 @@ snippet: "
|
| "
|
| frame size: 11
|
| parameter count: 1
|
| -bytecode array length: 203
|
| +bytecode array length: 199
|
| bytecodes: [
|
| B(Ldar), R(new_target),
|
| B(JumpIfUndefined), U8(20),
|
| @@ -24,7 +24,7 @@ bytecodes: [
|
| B(Star), R(1),
|
| B(LdaZero),
|
| B(TestEqualStrict), R(1),
|
| - B(JumpIfTrue), U8(57),
|
| + B(JumpIfTrue), U8(55),
|
| B(LdaSmi), U8(76),
|
| B(Star), R(2),
|
| B(CallRuntime), U16(Runtime::kAbort), R(2), U8(1),
|
| @@ -36,13 +36,11 @@ bytecodes: [
|
| B(Mov), R(context), R(4),
|
| B(Ldar), R(closure),
|
| B(Star), R(5),
|
| - B(LdaContextSlot), R(context), U8(4),
|
| - B(Star), R(6),
|
| + B(LdrContextSlot), R(context), U8(4), R(6),
|
| B(CallRuntime), U16(Runtime::kCreateJSGeneratorObject), R(5), U8(2),
|
| B(StaContextSlot), R(context), U8(5),
|
| B(Star), R(5),
|
| - B(LdaContextSlot), R(context), U8(5),
|
| - B(Star), R(6),
|
| + B(LdrContextSlot), R(context), U8(5), R(6),
|
| B(LdaZero),
|
| B(SuspendGenerator), R(6),
|
| B(Ldar), R(5),
|
| @@ -67,11 +65,10 @@ bytecodes: [
|
| B(Star), R(3),
|
| B(LdaZero),
|
| B(Star), R(2),
|
| - B(Jump), U8(36),
|
| + B(Jump), U8(35),
|
| B(Ldar), R(7),
|
| B(Throw),
|
| - B(LdaUndefined),
|
| - B(Star), R(5),
|
| + B(LdrUndefined), R(5),
|
| B(LdaTrue),
|
| B(Star), R(6),
|
| B(CallRuntime), U16(Runtime::k_CreateIterResultObject), R(5), U8(2),
|
| @@ -87,8 +84,7 @@ bytecodes: [
|
| B(Star), R(2),
|
| B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
|
| B(Star), R(4),
|
| - B(LdaContextSlot), R(context), U8(5),
|
| - B(Star), R(5),
|
| + B(LdrContextSlot), R(context), U8(5), R(5),
|
| B(CallRuntime), U16(Runtime::k_GeneratorClose), R(5), U8(1),
|
| B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(4), U8(1),
|
| B(LdaZero),
|
| @@ -113,7 +109,7 @@ bytecodes: [
|
| constant pool: [
|
| ]
|
| handlers: [
|
| - [38, 139, 145],
|
| + [38, 136, 142],
|
| ]
|
|
|
| ---
|
| @@ -123,7 +119,7 @@ snippet: "
|
| "
|
| frame size: 11
|
| parameter count: 1
|
| -bytecode array length: 297
|
| +bytecode array length: 292
|
| bytecodes: [
|
| B(Ldar), R(new_target),
|
| B(JumpIfUndefined), U8(26),
|
| @@ -131,7 +127,7 @@ bytecodes: [
|
| B(Star), R(1),
|
| B(LdaZero),
|
| B(TestEqualStrict), R(1),
|
| - B(JumpIfTrue), U8(63),
|
| + B(JumpIfTrue), U8(61),
|
| B(LdaSmi), U8(1),
|
| B(TestEqualStrict), R(1),
|
| B(JumpIfTrueConstant), U8(0),
|
| @@ -146,13 +142,11 @@ bytecodes: [
|
| B(Mov), R(context), R(4),
|
| B(Ldar), R(closure),
|
| B(Star), R(5),
|
| - B(LdaContextSlot), R(context), U8(4),
|
| - B(Star), R(6),
|
| + B(LdrContextSlot), R(context), U8(4), R(6),
|
| B(CallRuntime), U16(Runtime::kCreateJSGeneratorObject), R(5), U8(2),
|
| B(StaContextSlot), R(context), U8(5),
|
| B(Star), R(5),
|
| - B(LdaContextSlot), R(context), U8(5),
|
| - B(Star), R(6),
|
| + B(LdrContextSlot), R(context), U8(5), R(6),
|
| B(LdaZero),
|
| B(SuspendGenerator), R(6),
|
| B(Ldar), R(5),
|
| @@ -177,7 +171,7 @@ bytecodes: [
|
| B(Star), R(3),
|
| B(LdaZero),
|
| B(Star), R(2),
|
| - B(Jump), U8(115),
|
| + B(Jump), U8(113),
|
| B(Ldar), R(7),
|
| B(Throw),
|
| /* 16 S> */ B(LdaSmi), U8(42),
|
| @@ -186,8 +180,7 @@ bytecodes: [
|
| B(Star), R(6),
|
| B(CallRuntime), U16(Runtime::k_CreateIterResultObject), R(5), U8(2),
|
| B(Star), R(7),
|
| - B(LdaContextSlot), R(context), U8(5),
|
| - B(Star), R(5),
|
| + B(LdrContextSlot), R(context), U8(5), R(5),
|
| B(LdaSmi), U8(1),
|
| B(SuspendGenerator), R(5),
|
| B(Ldar), R(7),
|
| @@ -212,11 +205,10 @@ bytecodes: [
|
| B(Star), R(3),
|
| B(LdaSmi), U8(1),
|
| B(Star), R(2),
|
| - B(Jump), U8(36),
|
| + B(Jump), U8(35),
|
| B(Ldar), R(6),
|
| B(Throw),
|
| - B(LdaUndefined),
|
| - B(Star), R(5),
|
| + B(LdrUndefined), R(5),
|
| B(LdaTrue),
|
| B(Star), R(6),
|
| B(CallRuntime), U16(Runtime::k_CreateIterResultObject), R(5), U8(2),
|
| @@ -232,8 +224,7 @@ bytecodes: [
|
| B(Star), R(2),
|
| B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
|
| B(Star), R(4),
|
| - B(LdaContextSlot), R(context), U8(5),
|
| - B(Star), R(5),
|
| + B(LdrContextSlot), R(context), U8(5), R(5),
|
| B(CallRuntime), U16(Runtime::k_GeneratorClose), R(5), U8(1),
|
| B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(4), U8(1),
|
| B(LdaZero),
|
| @@ -264,7 +255,7 @@ constant pool: [
|
| kInstanceTypeDontCare,
|
| ]
|
| handlers: [
|
| - [44, 224, 230],
|
| + [44, 220, 226],
|
| ]
|
|
|
| ---
|
| @@ -274,7 +265,7 @@ snippet: "
|
| "
|
| frame size: 17
|
| parameter count: 1
|
| -bytecode array length: 808
|
| +bytecode array length: 784
|
| bytecodes: [
|
| B(Ldar), R(new_target),
|
| B(JumpIfUndefined), U8(26),
|
| @@ -282,7 +273,7 @@ bytecodes: [
|
| B(Star), R(3),
|
| B(LdaZero),
|
| B(TestEqualStrict), R(3),
|
| - B(JumpIfTrue), U8(63),
|
| + B(JumpIfTrue), U8(61),
|
| B(LdaSmi), U8(1),
|
| B(TestEqualStrict), R(3),
|
| B(JumpIfTrueConstant), U8(3),
|
| @@ -297,13 +288,11 @@ bytecodes: [
|
| B(Mov), R(context), R(6),
|
| B(Ldar), R(closure),
|
| B(Star), R(7),
|
| - B(LdaContextSlot), R(context), U8(4),
|
| - B(Star), R(8),
|
| + B(LdrContextSlot), R(context), U8(4), R(8),
|
| B(CallRuntime), U16(Runtime::kCreateJSGeneratorObject), R(7), U8(2),
|
| B(StaContextSlot), R(context), U8(5),
|
| B(Star), R(7),
|
| - B(LdaContextSlot), R(context), U8(5),
|
| - B(Star), R(8),
|
| + B(LdrContextSlot), R(context), U8(5), R(8),
|
| B(LdaZero),
|
| B(SuspendGenerator), R(8),
|
| B(Ldar), R(7),
|
| @@ -348,8 +337,7 @@ bytecodes: [
|
| /* 30 S> */ B(CreateArrayLiteral), U8(1), U8(0), U8(3),
|
| B(Star), R(12),
|
| /* 30 E> */ B(LdaConstant), U8(2),
|
| - B(KeyedLoadIC), R(12), U8(3),
|
| - B(Star), R(11),
|
| + B(LdrKeyedProperty), R(12), U8(3), R(11),
|
| /* 30 E> */ B(Call), R(11), R(12), U8(1), U8(1),
|
| /* 30 E> */ B(StaContextSlot), R(1), U8(7),
|
| B(LdaSmi), U8(-2),
|
| @@ -361,27 +349,22 @@ bytecodes: [
|
| B(LdaSmi), U8(76),
|
| B(Star), R(11),
|
| B(CallRuntime), U16(Runtime::kAbort), R(11), U8(1),
|
| - /* 27 S> */ B(LdaContextSlot), R(1), U8(7),
|
| - B(Star), R(13),
|
| - B(LoadIC), R(13), U8(4), U8(7),
|
| - B(Star), R(12),
|
| + /* 27 S> */ B(LdrContextSlot), R(1), U8(7), R(13),
|
| + B(LdrNamedProperty), R(13), U8(4), U8(7), R(12),
|
| /* 27 E> */ B(Call), R(12), R(13), U8(1), U8(5),
|
| /* 27 E> */ B(StaContextSlot), R(1), U8(8),
|
| B(Star), R(11),
|
| B(InvokeIntrinsic), U16(Runtime::k_IsJSReceiver), R(11), U8(1),
|
| B(ToBooleanLogicalNot),
|
| - B(JumpIfFalse), U8(12),
|
| - B(LdaContextSlot), R(1), U8(8),
|
| - B(Star), R(11),
|
| + B(JumpIfFalse), U8(11),
|
| + B(LdrContextSlot), R(1), U8(8), R(11),
|
| B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(11), U8(1),
|
| - B(LdaContextSlot), R(1), U8(8),
|
| - B(Star), R(11),
|
| + B(LdrContextSlot), R(1), U8(8), R(11),
|
| B(LoadIC), R(11), U8(5), U8(9),
|
| B(JumpIfToBooleanTrueConstant), U8(10),
|
| B(LdaSmi), U8(2),
|
| B(StaContextSlot), R(1), U8(9),
|
| - B(LdaContextSlot), R(1), U8(8),
|
| - B(Star), R(11),
|
| + B(LdrContextSlot), R(1), U8(8), R(11),
|
| B(LoadIC), R(11), U8(6), U8(11),
|
| B(StaContextSlot), R(1), U8(6),
|
| B(LdaContextSlot), R(1), U8(10),
|
| @@ -406,8 +389,7 @@ bytecodes: [
|
| B(Star), R(12),
|
| B(CallRuntime), U16(Runtime::k_CreateIterResultObject), R(11), U8(2),
|
| B(Star), R(13),
|
| - B(LdaContextSlot), R(1), U8(5),
|
| - B(Star), R(11),
|
| + B(LdrContextSlot), R(1), U8(5), R(11),
|
| B(LdaSmi), U8(1),
|
| B(SuspendGenerator), R(11),
|
| B(Ldar), R(13),
|
| @@ -439,15 +421,15 @@ bytecodes: [
|
| B(Star), R(8),
|
| B(LdaZero),
|
| B(Star), R(7),
|
| - B(Jump), U8(78),
|
| + B(Jump), U8(76),
|
| B(Ldar), R(12),
|
| B(Throw),
|
| B(Ldar), R(12),
|
| B(PopContext), R(2),
|
| B(LdaZero),
|
| B(StaContextSlot), R(1), U8(9),
|
| - B(Wide), B(Jump), U16(-230),
|
| - B(Jump), U8(49),
|
| + B(Wide), B(Jump), U16(-224),
|
| + B(Jump), U8(47),
|
| B(Star), R(12),
|
| B(LdaConstant), U8(11),
|
| B(Star), R(11),
|
| @@ -456,15 +438,13 @@ bytecodes: [
|
| B(CallRuntime), U16(Runtime::kPushCatchContext), R(11), U8(3),
|
| B(Star), R(10),
|
| B(PushContext), R(2),
|
| - B(LdaContextSlot), R(1), U8(9),
|
| - B(Star), R(11),
|
| + B(LdrContextSlot), R(1), U8(9), R(11),
|
| B(LdaSmi), U8(2),
|
| B(TestEqualStrict), R(11),
|
| B(JumpIfFalse), U8(7),
|
| B(LdaSmi), U8(1),
|
| B(StaContextSlot), R(1), U8(9),
|
| - B(LdaContextSlot), R(context), U8(4),
|
| - B(Star), R(11),
|
| + B(LdrContextSlot), R(context), U8(4), R(11),
|
| B(CallRuntime), U16(Runtime::kReThrow), R(11), U8(1),
|
| B(PopContext), R(2),
|
| B(LdaSmi), U8(-1),
|
| @@ -475,32 +455,27 @@ bytecodes: [
|
| B(Star), R(7),
|
| B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
|
| B(Star), R(9),
|
| - B(LdaContextSlot), R(1), U8(9),
|
| - B(Star), R(10),
|
| + B(LdrContextSlot), R(1), U8(9), R(10),
|
| B(LdaZero),
|
| B(TestEqualStrict), R(10),
|
| - B(JumpIfTrue), U8(10),
|
| - B(LdaContextSlot), R(1), U8(7),
|
| - B(Star), R(10),
|
| + B(JumpIfTrue), U8(9),
|
| + B(LdrContextSlot), R(1), U8(7), R(10),
|
| B(LdaUndefined),
|
| B(TestEqualStrict), R(10),
|
| B(ToBooleanLogicalNot),
|
| B(JumpIfFalseConstant), U8(16),
|
| - B(LdaContextSlot), R(1), U8(7),
|
| - B(Star), R(10),
|
| + B(LdrContextSlot), R(1), U8(7), R(10),
|
| B(LoadIC), R(10), U8(12), U8(13),
|
| B(StaContextSlot), R(1), U8(11),
|
| - B(LdaContextSlot), R(1), U8(11),
|
| - B(Star), R(10),
|
| + B(LdrContextSlot), R(1), U8(11), R(10),
|
| B(LdaNull),
|
| B(TestEqual), R(10),
|
| B(JumpIfFalse), U8(4),
|
| B(JumpConstant), U8(15),
|
| - B(LdaContextSlot), R(1), U8(9),
|
| - B(Star), R(10),
|
| + B(LdrContextSlot), R(1), U8(9), R(10),
|
| B(LdaSmi), U8(1),
|
| B(TestEqualStrict), R(10),
|
| - B(JumpIfFalse), U8(82),
|
| + B(JumpIfFalse), U8(80),
|
| B(LdaContextSlot), R(1), U8(11),
|
| B(TypeOf),
|
| B(Star), R(10),
|
| @@ -515,10 +490,8 @@ bytecodes: [
|
| B(CallRuntime), U16(Runtime::kNewTypeError), R(10), U8(2),
|
| B(Throw),
|
| B(Mov), R(context), R(10),
|
| - B(LdaContextSlot), R(1), U8(11),
|
| - B(Star), R(11),
|
| - B(LdaContextSlot), R(1), U8(7),
|
| - B(Star), R(12),
|
| + B(LdrContextSlot), R(1), U8(11), R(11),
|
| + B(LdrContextSlot), R(1), U8(7), R(12),
|
| B(CallRuntime), U16(Runtime::k_Call), R(11), U8(2),
|
| B(Jump), U8(30),
|
| B(Star), R(12),
|
| @@ -532,20 +505,16 @@ bytecodes: [
|
| B(Ldar), R(10),
|
| B(PushContext), R(2),
|
| B(PopContext), R(2),
|
| - B(Jump), U8(44),
|
| - B(LdaContextSlot), R(1), U8(11),
|
| - B(Star), R(10),
|
| - B(LdaContextSlot), R(1), U8(7),
|
| - B(Star), R(11),
|
| + B(Jump), U8(40),
|
| + B(LdrContextSlot), R(1), U8(11), R(10),
|
| + B(LdrContextSlot), R(1), U8(7), R(11),
|
| B(CallRuntime), U16(Runtime::k_Call), R(10), U8(2),
|
| B(StaContextSlot), R(1), U8(12),
|
| - B(LdaContextSlot), R(1), U8(12),
|
| - B(Star), R(10),
|
| + B(LdrContextSlot), R(1), U8(12), R(10),
|
| B(InvokeIntrinsic), U16(Runtime::k_IsJSReceiver), R(10), U8(1),
|
| B(JumpIfToBooleanFalse), U8(4),
|
| - B(Jump), U8(12),
|
| - B(LdaContextSlot), R(1), U8(12),
|
| - B(Star), R(10),
|
| + B(Jump), U8(11),
|
| + B(LdrContextSlot), R(1), U8(12), R(10),
|
| B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(10), U8(1),
|
| B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(9), U8(1),
|
| B(LdaZero),
|
| @@ -561,17 +530,16 @@ bytecodes: [
|
| B(Star), R(5),
|
| B(LdaSmi), U8(1),
|
| B(Star), R(4),
|
| - B(Jump), U8(49),
|
| + B(Jump), U8(48),
|
| B(Ldar), R(8),
|
| B(PopContext), R(1),
|
| B(PopContext), R(1),
|
| B(Star), R(5),
|
| B(LdaSmi), U8(2),
|
| B(Star), R(4),
|
| - B(Jump), U8(35),
|
| + B(Jump), U8(34),
|
| B(PopContext), R(1),
|
| - B(LdaUndefined),
|
| - B(Star), R(7),
|
| + B(LdrUndefined), R(7),
|
| B(LdaTrue),
|
| B(Star), R(8),
|
| B(CallRuntime), U16(Runtime::k_CreateIterResultObject), R(7), U8(2),
|
| @@ -587,8 +555,7 @@ bytecodes: [
|
| B(Star), R(4),
|
| B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
|
| B(Star), R(6),
|
| - B(LdaContextSlot), R(context), U8(5),
|
| - B(Star), R(7),
|
| + B(LdrContextSlot), R(context), U8(5), R(7),
|
| B(CallRuntime), U16(Runtime::k_GeneratorClose), R(7), U8(1),
|
| B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(6), U8(1),
|
| B(LdaZero),
|
| @@ -641,9 +608,9 @@ constant pool: [
|
| kInstanceTypeDontCare,
|
| ]
|
| handlers: [
|
| - [44, 726, 732],
|
| - [156, 462, 468],
|
| - [159, 413, 415],
|
| - [570, 585, 587],
|
| + [44, 703, 709],
|
| + [154, 451, 457],
|
| + [157, 404, 406],
|
| + [554, 567, 569],
|
| ]
|
|
|
|
|