Index: test/cctest/interpreter/bytecode_expectations/ConstVariableContextSlot.golden |
diff --git a/test/cctest/interpreter/bytecode_expectations/ConstVariableContextSlot.golden b/test/cctest/interpreter/bytecode_expectations/ConstVariableContextSlot.golden |
index 1d17e2852c8607d3f3ffec516a148267901e0fa1..956000ff49fdbb01287bc7f37d41e7d3decc1ce3 100644 |
--- a/test/cctest/interpreter/bytecode_expectations/ConstVariableContextSlot.golden |
+++ b/test/cctest/interpreter/bytecode_expectations/ConstVariableContextSlot.golden |
@@ -11,17 +11,17 @@ snippet: " |
" |
frame size: 2 |
parameter count: 1 |
-bytecode array length: 23 |
+bytecode array length: 19 |
bytecodes: [ |
B(CreateFunctionContext), U8(1), |
B(PushContext), R(1), |
B(LdaTheHole), |
- B(StaContextSlot), R(context), U8(4), U8(0), |
+ B(StaCurrentContextSlot), U8(4), |
B(CreateClosure), U8(0), U8(2), |
B(Star), R(0), |
/* 30 E> */ B(StackCheck), |
/* 44 S> */ B(LdaSmi), U8(10), |
- /* 44 E> */ B(StaContextSlot), R(context), U8(4), U8(0), |
+ /* 44 E> */ B(StaCurrentContextSlot), U8(4), |
B(LdaUndefined), |
/* 74 S> */ B(Return), |
] |
@@ -37,18 +37,18 @@ snippet: " |
" |
frame size: 2 |
parameter count: 1 |
-bytecode array length: 26 |
+bytecode array length: 20 |
bytecodes: [ |
B(CreateFunctionContext), U8(1), |
B(PushContext), R(1), |
B(LdaTheHole), |
- B(StaContextSlot), R(context), U8(4), U8(0), |
+ B(StaCurrentContextSlot), U8(4), |
B(CreateClosure), U8(0), U8(2), |
B(Star), R(0), |
/* 30 E> */ B(StackCheck), |
/* 44 S> */ B(LdaSmi), U8(10), |
- /* 44 E> */ B(StaContextSlot), R(context), U8(4), U8(0), |
- /* 74 S> */ B(LdaContextSlot), R(context), U8(4), U8(0), |
+ /* 44 E> */ B(StaCurrentContextSlot), U8(4), |
+ /* 74 S> */ B(LdaCurrentContextSlot), U8(4), |
/* 84 S> */ B(Return), |
] |
constant pool: [ |
@@ -63,24 +63,24 @@ snippet: " |
" |
frame size: 4 |
parameter count: 1 |
-bytecode array length: 45 |
+bytecode array length: 39 |
bytecodes: [ |
B(CreateFunctionContext), U8(1), |
B(PushContext), R(1), |
B(LdaTheHole), |
- B(StaContextSlot), R(context), U8(4), U8(0), |
+ B(StaCurrentContextSlot), U8(4), |
B(CreateClosure), U8(0), U8(2), |
B(Star), R(0), |
/* 30 E> */ B(StackCheck), |
/* 47 S> */ B(LdaSmi), U8(20), |
B(Star), R(2), |
- /* 47 E> */ B(LdaContextSlot), R(context), U8(4), U8(0), |
+ /* 47 E> */ B(LdaCurrentContextSlot), U8(4), |
B(JumpIfNotHole), U8(11), |
B(LdaConstant), U8(1), |
B(Star), R(3), |
B(CallRuntime), U16(Runtime::kThrowReferenceError), R(3), U8(1), |
B(CallRuntime), U16(Runtime::kThrowConstAssignError), R(0), U8(0), |
- /* 47 E> */ B(StaContextSlot), R(context), U8(4), U8(0), |
+ /* 47 E> */ B(StaCurrentContextSlot), U8(4), |
B(LdaUndefined), |
/* 80 S> */ B(Return), |
] |
@@ -97,17 +97,17 @@ snippet: " |
" |
frame size: 2 |
parameter count: 1 |
-bytecode array length: 30 |
+bytecode array length: 26 |
bytecodes: [ |
B(CreateFunctionContext), U8(1), |
B(PushContext), R(1), |
B(LdaTheHole), |
- B(StaContextSlot), R(context), U8(4), U8(0), |
+ B(StaCurrentContextSlot), U8(4), |
B(CreateClosure), U8(0), U8(2), |
B(Star), R(0), |
/* 30 E> */ B(StackCheck), |
/* 44 S> */ B(LdaSmi), U8(10), |
- /* 44 E> */ B(StaContextSlot), R(context), U8(4), U8(0), |
+ /* 44 E> */ B(StaCurrentContextSlot), U8(4), |
/* 48 S> */ B(LdaSmi), U8(20), |
/* 50 E> */ B(CallRuntime), U16(Runtime::kThrowConstAssignError), R(0), U8(0), |
B(LdaUndefined), |