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 d66aa28dcdd4fedb319de5115aaa99edb1e30aa6..94da8c111bc73050e62bc879899df67fb2b6fad5 100644 |
--- a/test/cctest/interpreter/bytecode_expectations/Generators.golden |
+++ b/test/cctest/interpreter/bytecode_expectations/Generators.golden |
@@ -13,7 +13,7 @@ snippet: " |
" |
frame size: 12 |
parameter count: 1 |
-bytecode array length: 204 |
+bytecode array length: 195 |
bytecodes: [ |
B(Ldar), R(new_target), |
B(JumpIfUndefined), U8(28), |
@@ -23,35 +23,30 @@ bytecodes: [ |
B(Star), R(1), |
B(LdaZero), |
B(TestEqualStrict), R(1), U8(0), |
- B(JumpIfTrue), U8(53), |
+ B(JumpIfTrue), U8(44), |
B(LdaSmi), I8(78), |
B(Star), R(3), |
B(CallRuntime), U16(Runtime::kAbort), R(3), U8(1), |
B(LdaSmi), I8(-2), |
B(Star), R(1), |
- B(CreateFunctionContext), U8(2), |
+ B(CreateFunctionContext), U8(1), |
B(PushContext), R(0), |
- B(Ldar), R(this), |
- B(StaCurrentContextSlot), U8(4), |
/* 11 E> */ B(StackCheck), |
B(Mov), R(context), R(5), |
- B(LdaCurrentContextSlot), U8(4), |
- B(Star), R(7), |
B(Mov), R(closure), R(6), |
+ B(Mov), R(this), R(7), |
/* 11 E> */ B(CallRuntime), U16(Runtime::kCreateJSGeneratorObject), R(6), U8(2), |
- B(StaCurrentContextSlot), U8(5), |
+ B(StaCurrentContextSlot), U8(4), |
B(Star), R(6), |
- B(LdaCurrentContextSlot), U8(5), |
- B(Star), R(7), |
B(LdaZero), |
- B(SuspendGenerator), R(7), |
+ B(SuspendGenerator), R(6), |
B(Ldar), R(6), |
/* 16 S> */ B(Return), |
B(LdaSmi), I8(-2), |
B(Star), R(1), |
- B(CallRuntime), U16(Runtime::k_GeneratorGetInputOrDebugPos), R(7), U8(1), |
+ B(CallRuntime), U16(Runtime::k_GeneratorGetInputOrDebugPos), R(6), U8(1), |
B(Star), R(8), |
- B(CallRuntime), U16(Runtime::k_GeneratorGetResumeMode), R(7), U8(1), |
+ B(CallRuntime), U16(Runtime::k_GeneratorGetResumeMode), R(6), U8(1), |
B(Star), R(9), |
B(LdaZero), |
B(TestEqualStrict), R(9), U8(0), |
@@ -88,7 +83,7 @@ bytecodes: [ |
B(LdaTheHole), |
B(SetPendingMessage), |
B(Star), R(5), |
- B(LdaCurrentContextSlot), U8(5), |
+ B(LdaCurrentContextSlot), U8(4), |
B(Star), R(6), |
B(CallRuntime), U16(Runtime::k_GeneratorClose), R(6), U8(1), |
B(Ldar), R(5), |
@@ -115,7 +110,7 @@ bytecodes: [ |
constant pool: [ |
] |
handlers: [ |
- [46, 143, 149], |
+ [42, 134, 140], |
] |
--- |
@@ -125,7 +120,7 @@ snippet: " |
" |
frame size: 12 |
parameter count: 1 |
-bytecode array length: 299 |
+bytecode array length: 290 |
bytecodes: [ |
B(Ldar), R(new_target), |
B(JumpIfUndefined), U8(35), |
@@ -135,38 +130,33 @@ bytecodes: [ |
B(Star), R(1), |
B(LdaZero), |
B(TestEqualStrict), R(1), U8(0), |
- B(JumpIfTrue), U8(60), |
+ B(JumpIfTrue), U8(51), |
B(LdaSmi), I8(1), |
B(TestEqualStrict), R(1), U8(0), |
- B(JumpIfTrue), U8(130), |
+ B(JumpIfTrue), U8(121), |
B(LdaSmi), I8(78), |
B(Star), R(3), |
B(CallRuntime), U16(Runtime::kAbort), R(3), U8(1), |
B(LdaSmi), I8(-2), |
B(Star), R(1), |
- B(CreateFunctionContext), U8(2), |
+ B(CreateFunctionContext), U8(1), |
B(PushContext), R(0), |
- B(Ldar), R(this), |
- B(StaCurrentContextSlot), U8(4), |
/* 11 E> */ B(StackCheck), |
B(Mov), R(context), R(5), |
- B(LdaCurrentContextSlot), U8(4), |
- B(Star), R(7), |
B(Mov), R(closure), R(6), |
+ B(Mov), R(this), R(7), |
/* 11 E> */ B(CallRuntime), U16(Runtime::kCreateJSGeneratorObject), R(6), U8(2), |
- B(StaCurrentContextSlot), U8(5), |
+ B(StaCurrentContextSlot), U8(4), |
B(Star), R(6), |
- B(LdaCurrentContextSlot), U8(5), |
- B(Star), R(7), |
B(LdaZero), |
- B(SuspendGenerator), R(7), |
+ B(SuspendGenerator), R(6), |
B(Ldar), R(6), |
/* 25 S> */ B(Return), |
B(LdaSmi), I8(-2), |
B(Star), R(1), |
- B(CallRuntime), U16(Runtime::k_GeneratorGetInputOrDebugPos), R(7), U8(1), |
+ B(CallRuntime), U16(Runtime::k_GeneratorGetInputOrDebugPos), R(6), U8(1), |
B(Star), R(8), |
- B(CallRuntime), U16(Runtime::k_GeneratorGetResumeMode), R(7), U8(1), |
+ B(CallRuntime), U16(Runtime::k_GeneratorGetResumeMode), R(6), U8(1), |
B(Star), R(9), |
B(LdaZero), |
B(TestEqualStrict), R(9), U8(0), |
@@ -185,23 +175,23 @@ bytecodes: [ |
B(Jump), U8(113), |
B(Ldar), R(8), |
/* 11 E> */ B(Throw), |
- /* 16 S> */ B(LdaSmi), I8(42), |
+ /* 16 S> */ B(LdaCurrentContextSlot), U8(4), |
B(Star), R(6), |
- B(LdaFalse), |
+ B(LdaSmi), I8(42), |
B(Star), R(7), |
- B(InvokeIntrinsic), U8(Runtime::k_CreateIterResultObject), R(6), U8(2), |
- B(Star), R(6), |
- B(LdaCurrentContextSlot), U8(5), |
+ B(LdaFalse), |
+ B(Star), R(8), |
+ /* 16 E> */ B(InvokeIntrinsic), U8(Runtime::k_CreateIterResultObject), R(7), U8(2), |
B(Star), R(7), |
B(LdaSmi), I8(1), |
- B(SuspendGenerator), R(7), |
- B(Ldar), R(6), |
+ B(SuspendGenerator), R(6), |
+ B(Ldar), R(7), |
/* 25 S> */ B(Return), |
B(LdaSmi), I8(-2), |
B(Star), R(1), |
- B(CallRuntime), U16(Runtime::k_GeneratorGetInputOrDebugPos), R(7), U8(1), |
+ B(CallRuntime), U16(Runtime::k_GeneratorGetInputOrDebugPos), R(6), U8(1), |
B(Star), R(8), |
- B(CallRuntime), U16(Runtime::k_GeneratorGetResumeMode), R(7), U8(1), |
+ B(CallRuntime), U16(Runtime::k_GeneratorGetResumeMode), R(6), U8(1), |
B(Star), R(9), |
B(LdaZero), |
B(TestEqualStrict), R(9), U8(0), |
@@ -238,7 +228,7 @@ bytecodes: [ |
B(LdaTheHole), |
B(SetPendingMessage), |
B(Star), R(5), |
- B(LdaCurrentContextSlot), U8(5), |
+ B(LdaCurrentContextSlot), U8(4), |
B(Star), R(6), |
B(CallRuntime), U16(Runtime::k_GeneratorClose), R(6), U8(1), |
B(Ldar), R(5), |
@@ -270,7 +260,7 @@ bytecodes: [ |
constant pool: [ |
] |
handlers: [ |
- [53, 228, 234], |
+ [49, 219, 225], |
] |
--- |
@@ -280,7 +270,7 @@ snippet: " |
" |
frame size: 18 |
parameter count: 1 |
-bytecode array length: 775 |
+bytecode array length: 762 |
bytecodes: [ |
B(Ldar), R(new_target), |
B(JumpIfUndefined), U8(35), |
@@ -290,38 +280,33 @@ bytecodes: [ |
B(Star), R(3), |
B(LdaZero), |
B(TestEqualStrict), R(3), U8(0), |
- B(JumpIfTrue), U8(60), |
+ B(JumpIfTrue), U8(51), |
B(LdaSmi), I8(1), |
B(TestEqualStrict), R(3), U8(0), |
- B(JumpIfTrue), U8(154), |
+ B(JumpIfTrue), U8(145), |
B(LdaSmi), I8(78), |
B(Star), R(5), |
B(CallRuntime), U16(Runtime::kAbort), R(5), U8(1), |
B(LdaSmi), I8(-2), |
B(Star), R(3), |
- B(CreateFunctionContext), U8(9), |
+ B(CreateFunctionContext), U8(8), |
B(PushContext), R(0), |
- B(Ldar), R(this), |
- B(StaCurrentContextSlot), U8(4), |
/* 11 E> */ B(StackCheck), |
B(Mov), R(context), R(7), |
- B(LdaCurrentContextSlot), U8(4), |
- B(Star), R(9), |
B(Mov), R(closure), R(8), |
+ B(Mov), R(this), R(9), |
/* 11 E> */ B(CallRuntime), U16(Runtime::kCreateJSGeneratorObject), R(8), U8(2), |
- B(StaCurrentContextSlot), U8(5), |
+ B(StaCurrentContextSlot), U8(4), |
B(Star), R(8), |
- B(LdaCurrentContextSlot), U8(5), |
- B(Star), R(9), |
B(LdaZero), |
- B(SuspendGenerator), R(9), |
+ B(SuspendGenerator), R(8), |
B(Ldar), R(8), |
/* 44 S> */ B(Return), |
B(LdaSmi), I8(-2), |
B(Star), R(3), |
- B(CallRuntime), U16(Runtime::k_GeneratorGetInputOrDebugPos), R(9), U8(1), |
+ B(CallRuntime), U16(Runtime::k_GeneratorGetInputOrDebugPos), R(8), U8(1), |
B(Star), R(10), |
- B(CallRuntime), U16(Runtime::k_GeneratorGetResumeMode), R(9), U8(1), |
+ B(CallRuntime), U16(Runtime::k_GeneratorGetResumeMode), R(8), U8(1), |
B(Star), R(11), |
B(LdaZero), |
B(TestEqualStrict), R(11), U8(0), |
@@ -346,7 +331,7 @@ bytecodes: [ |
B(LdaTheHole), |
B(StaCurrentContextSlot), U8(4), |
B(LdaZero), |
- B(StaContextSlot), R(1), U8(9), U8(0), |
+ B(StaContextSlot), R(1), U8(8), U8(0), |
B(Mov), R(context), R(10), |
B(Mov), R(context), R(11), |
/* 30 S> */ B(CreateArrayLiteral), U8(1), U8(2), U8(9), |
@@ -356,7 +341,7 @@ bytecodes: [ |
B(CallProperty), R(13), R(12), U8(1), U8(5), |
B(JumpIfJSReceiver), U8(7), |
B(CallRuntime), U16(Runtime::kThrowSymbolIteratorInvalid), R(0), U8(0), |
- /* 30 E> */ B(StaContextSlot), R(1), U8(7), U8(0), |
+ /* 30 E> */ B(StaContextSlot), R(1), U8(6), U8(0), |
B(LdaSmi), I8(-2), |
B(TestEqual), R(3), U8(0), |
B(JumpIfTrue), U8(18), |
@@ -366,56 +351,56 @@ bytecodes: [ |
B(LdaSmi), I8(78), |
B(Star), R(12), |
B(CallRuntime), U16(Runtime::kAbort), R(12), U8(1), |
- /* 27 S> */ B(LdaContextSlot), R(1), U8(7), U8(0), |
+ /* 27 S> */ B(LdaContextSlot), R(1), U8(6), U8(0), |
B(Star), R(13), |
B(LdaNamedProperty), R(13), U8(3), U8(9), |
B(Star), R(12), |
/* 27 E> */ B(CallProperty), R(12), R(13), U8(1), U8(7), |
- /* 27 E> */ B(StaContextSlot), R(1), U8(8), U8(0), |
+ /* 27 E> */ B(StaContextSlot), R(1), U8(7), U8(0), |
B(Star), R(12), |
B(InvokeIntrinsic), U8(Runtime::k_IsJSReceiver), R(12), U8(1), |
B(ToBooleanLogicalNot), |
B(JumpIfFalse), U8(13), |
- B(LdaContextSlot), R(1), U8(8), U8(0), |
+ B(LdaContextSlot), R(1), U8(7), U8(0), |
B(Star), R(12), |
B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(12), U8(1), |
- B(LdaContextSlot), R(1), U8(8), U8(0), |
+ B(LdaContextSlot), R(1), U8(7), U8(0), |
B(Star), R(12), |
B(LdaNamedProperty), R(12), U8(4), U8(11), |
B(JumpIfToBooleanTrue), U8(147), |
- B(LdaContextSlot), R(1), U8(8), U8(0), |
+ B(LdaContextSlot), R(1), U8(7), U8(0), |
B(Star), R(12), |
B(LdaNamedProperty), R(12), U8(5), U8(13), |
- B(StaContextSlot), R(1), U8(10), U8(0), |
- B(LdaSmi), I8(2), |
B(StaContextSlot), R(1), U8(9), U8(0), |
- B(LdaContextSlot), R(1), U8(10), U8(0), |
- B(StaContextSlot), R(1), U8(6), U8(0), |
+ B(LdaSmi), I8(2), |
+ B(StaContextSlot), R(1), U8(8), U8(0), |
+ B(LdaContextSlot), R(1), U8(9), U8(0), |
+ B(StaContextSlot), R(1), U8(5), U8(0), |
/* 16 E> */ B(StackCheck), |
B(Ldar), R(closure), |
B(CreateBlockContext), U8(6), |
B(PushContext), R(2), |
B(LdaTheHole), |
B(StaCurrentContextSlot), U8(4), |
- B(LdaContextSlot), R(1), U8(6), U8(0), |
+ B(LdaContextSlot), R(1), U8(5), U8(0), |
B(StaCurrentContextSlot), U8(4), |
- /* 36 S> */ B(LdaCurrentContextSlot), U8(4), |
+ /* 36 S> */ B(LdaContextSlot), R(1), U8(4), U8(0), |
B(Star), R(12), |
- B(LdaFalse), |
+ B(LdaCurrentContextSlot), U8(4), |
B(Star), R(13), |
- B(InvokeIntrinsic), U8(Runtime::k_CreateIterResultObject), R(12), U8(2), |
- B(Star), R(12), |
- B(LdaContextSlot), R(1), U8(5), U8(0), |
+ B(LdaFalse), |
+ B(Star), R(14), |
+ /* 42 E> */ B(InvokeIntrinsic), U8(Runtime::k_CreateIterResultObject), R(13), U8(2), |
B(Star), R(13), |
B(LdaSmi), I8(1), |
- B(SuspendGenerator), R(13), |
- B(Ldar), R(12), |
+ B(SuspendGenerator), R(12), |
+ B(Ldar), R(13), |
/* 44 S> */ B(Return), |
B(LdaSmi), I8(-2), |
B(Star), R(3), |
- B(CallRuntime), U16(Runtime::k_GeneratorGetInputOrDebugPos), R(13), U8(1), |
+ B(CallRuntime), U16(Runtime::k_GeneratorGetInputOrDebugPos), R(12), U8(1), |
B(Star), R(14), |
- B(CallRuntime), U16(Runtime::k_GeneratorGetResumeMode), R(13), U8(1), |
+ B(CallRuntime), U16(Runtime::k_GeneratorGetResumeMode), R(12), U8(1), |
B(Star), R(15), |
B(LdaZero), |
B(TestEqualStrict), R(15), U8(0), |
@@ -442,7 +427,7 @@ bytecodes: [ |
/* 36 E> */ B(Throw), |
B(PopContext), R(2), |
B(LdaZero), |
- B(StaContextSlot), R(1), U8(9), U8(0), |
+ B(StaContextSlot), R(1), U8(8), U8(0), |
B(JumpLoop), U8(218), I8(0), |
B(Jump), U8(44), |
B(Star), R(12), |
@@ -450,13 +435,13 @@ bytecodes: [ |
B(CreateCatchContext), R(12), U8(7), U8(8), |
B(Star), R(11), |
B(PushContext), R(2), |
- B(LdaContextSlot), R(1), U8(9), U8(0), |
+ B(LdaContextSlot), R(1), U8(8), U8(0), |
B(Star), R(12), |
B(LdaSmi), I8(2), |
B(TestEqualStrict), R(12), U8(15), |
B(JumpIfFalse), U8(8), |
B(LdaSmi), I8(1), |
- B(StaContextSlot), R(1), U8(9), U8(0), |
+ B(StaContextSlot), R(1), U8(8), U8(0), |
B(LdaCurrentContextSlot), U8(4), |
B(Star), R(12), |
B(CallRuntime), U16(Runtime::kReThrow), R(12), U8(1), |
@@ -470,26 +455,26 @@ bytecodes: [ |
B(LdaTheHole), |
B(SetPendingMessage), |
B(Star), R(10), |
- B(LdaContextSlot), R(1), U8(9), U8(0), |
+ B(LdaContextSlot), R(1), U8(8), U8(0), |
B(Star), R(11), |
B(LdaZero), |
B(TestEqualStrict), R(11), U8(16), |
B(JumpIfTrue), U8(159), |
- B(LdaContextSlot), R(1), U8(7), U8(0), |
+ B(LdaContextSlot), R(1), U8(6), U8(0), |
B(Star), R(11), |
B(LdaNamedProperty), R(11), U8(9), U8(17), |
- B(StaContextSlot), R(1), U8(11), U8(0), |
- B(LdaContextSlot), R(1), U8(11), U8(0), |
+ B(StaContextSlot), R(1), U8(10), U8(0), |
+ B(LdaContextSlot), R(1), U8(10), U8(0), |
B(Star), R(11), |
B(TestUndetectable), R(11), |
B(JumpIfFalse), U8(4), |
B(Jump), U8(133), |
- B(LdaContextSlot), R(1), U8(9), U8(0), |
+ B(LdaContextSlot), R(1), U8(8), U8(0), |
B(Star), R(11), |
B(LdaSmi), I8(1), |
B(TestEqualStrict), R(11), U8(20), |
B(JumpIfFalse), U8(75), |
- B(LdaContextSlot), R(1), U8(11), U8(0), |
+ B(LdaContextSlot), R(1), U8(10), U8(0), |
B(TypeOf), |
B(Star), R(11), |
B(LdaConstant), U8(10), |
@@ -503,9 +488,9 @@ bytecodes: [ |
B(CallRuntime), U16(Runtime::kNewTypeError), R(11), U8(2), |
B(Throw), |
B(Mov), R(context), R(11), |
- B(LdaContextSlot), R(1), U8(11), U8(0), |
+ B(LdaContextSlot), R(1), U8(10), U8(0), |
B(Star), R(12), |
- B(LdaContextSlot), R(1), U8(7), U8(0), |
+ B(LdaContextSlot), R(1), U8(6), U8(0), |
B(Star), R(13), |
B(InvokeIntrinsic), U8(Runtime::k_Call), R(12), U8(2), |
B(Jump), U8(20), |
@@ -519,18 +504,18 @@ bytecodes: [ |
B(PushContext), R(2), |
B(PopContext), R(2), |
B(Jump), U8(47), |
- B(LdaContextSlot), R(1), U8(11), U8(0), |
+ B(LdaContextSlot), R(1), U8(10), U8(0), |
B(Star), R(11), |
- B(LdaContextSlot), R(1), U8(7), U8(0), |
+ B(LdaContextSlot), R(1), U8(6), U8(0), |
B(Star), R(12), |
B(InvokeIntrinsic), U8(Runtime::k_Call), R(11), U8(2), |
- B(StaContextSlot), R(1), U8(12), U8(0), |
- B(LdaContextSlot), R(1), U8(12), U8(0), |
+ B(StaContextSlot), R(1), U8(11), U8(0), |
+ B(LdaContextSlot), R(1), U8(11), U8(0), |
B(Star), R(11), |
B(InvokeIntrinsic), U8(Runtime::k_IsJSReceiver), R(11), U8(1), |
B(JumpIfToBooleanFalse), U8(4), |
B(Jump), U8(13), |
- B(LdaContextSlot), R(1), U8(12), U8(0), |
+ B(LdaContextSlot), R(1), U8(11), U8(0), |
B(Star), R(11), |
B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(11), U8(1), |
B(Ldar), R(10), |
@@ -540,15 +525,13 @@ bytecodes: [ |
B(JumpIfTrue), U8(11), |
B(LdaSmi), I8(1), |
B(TestEqualStrict), R(8), U8(0), |
- B(JumpIfTrue), U8(17), |
- B(Jump), U8(28), |
- B(PopContext), R(1), |
+ B(JumpIfTrue), U8(15), |
+ B(Jump), U8(24), |
B(PopContext), R(1), |
B(LdaSmi), I8(1), |
B(Star), R(5), |
B(Mov), R(9), R(6), |
- B(Jump), U8(47), |
- B(PopContext), R(1), |
+ B(Jump), U8(45), |
B(PopContext), R(1), |
B(LdaSmi), I8(2), |
B(Star), R(5), |
@@ -573,7 +556,7 @@ bytecodes: [ |
B(LdaTheHole), |
B(SetPendingMessage), |
B(Star), R(7), |
- B(LdaCurrentContextSlot), U8(5), |
+ B(LdaCurrentContextSlot), U8(4), |
B(Star), R(8), |
B(CallRuntime), U16(Runtime::k_GeneratorClose), R(8), U8(1), |
B(Ldar), R(7), |
@@ -621,12 +604,12 @@ constant pool: [ |
ONE_BYTE_INTERNALIZED_STRING_TYPE ["function"], |
ONE_BYTE_INTERNALIZED_STRING_TYPE [""], |
FIXED_ARRAY_TYPE, |
- Smi [579], |
+ Smi [575], |
] |
handlers: [ |
- [53, 694, 700], |
- [149, 445, 451], |
- [152, 401, 403], |
- [547, 563, 565], |
+ [49, 681, 687], |
+ [140, 436, 442], |
+ [143, 392, 394], |
+ [538, 554, 556], |
] |