[Interpreter] Move context chain search loop to handler

test/cctest/interpreter/bytecode_expectations/Generators.golden

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 c4ada553fbf75c51900c552909c2ef0c4b85ad24..ae071a089a052b050dfb4b2ef2d307ecb5b008af 100644
--- a/test/cctest/interpreter/bytecode_expectations/Generators.golden
+++ b/test/cctest/interpreter/bytecode_expectations/Generators.golden
@@ -14,7 +14,7 @@ snippet: "
 "
 frame size: 11
 parameter count: 1
-bytecode array length: 207
+bytecode array length: 212
 bytecodes: [
                 B(Ldar), R(new_target),
                 B(JumpIfUndefined), U8(21),
@@ -22,7 +22,7 @@ bytecodes: [
                 B(Star), R(1),
                 B(LdaZero),
                 B(TestEqualStrict), R(1), U8(0),
-                B(JumpIfTrue), U8(57),
+                B(JumpIfTrue), U8(61),
                 B(LdaSmi), U8(76),
                 B(Star), R(2),
                 B(CallRuntime), U16(Runtime::kAbort), R(2), U8(1),
@@ -31,16 +31,16 @@ bytecodes: [
                 B(CreateFunctionContext), U8(2),
                 B(PushContext), R(0),
                 B(Ldar), R(this),
-                B(StaContextSlot), R(context), U8(4),
+                B(StaContextSlot), R(context), U8(4), U8(0),
   /*   11 E> */ B(StackCheck),
                 B(Mov), R(context), R(4),
-  /*   11 E> */ B(LdrContextSlot), R(context), U8(4), R(6),
+  /*   11 E> */ B(LdrContextSlot), R(context), U8(4), U8(0), R(6),
                 B(Ldar), R(6),
                 B(Mov), R(closure), R(5),
                 B(CallRuntime), U16(Runtime::kCreateJSGeneratorObject), R(5), U8(2),
-                B(StaContextSlot), R(context), U8(5),
+                B(StaContextSlot), R(context), U8(5), U8(0),
                 B(Star), R(5),
-                B(LdrContextSlot), R(context), U8(5), R(6),
+                B(LdrContextSlot), R(context), U8(5), U8(0), R(6),
                 B(LdaZero),
                 B(SuspendGenerator), R(6),
                 B(Ldar), R(5),
@@ -84,7 +84,7 @@ bytecodes: [
                 B(Star), R(2),
                 B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
                 B(Star), R(4),
-                B(LdrContextSlot), R(context), U8(5), R(5),
+                B(LdrContextSlot), R(context), U8(5), U8(0), R(5),
                 B(CallRuntime), U16(Runtime::k_GeneratorClose), R(5), U8(1),
                 B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(4), U8(1),
                 B(LdaZero),
@@ -109,7 +109,7 @@ bytecodes: [
 constant pool: [
 ]
 handlers: [
-  [40, 141, 147],
+  [41, 145, 151],
 ]
 
 ---
@@ -119,7 +119,7 @@ snippet: "
 "
 frame size: 11
 parameter count: 1
-bytecode array length: 304
+bytecode array length: 310
 bytecodes: [
                 B(Ldar), R(new_target),
                 B(JumpIfUndefined), U8(28),
@@ -127,7 +127,7 @@ bytecodes: [
                 B(Star), R(1),
                 B(LdaZero),
                 B(TestEqualStrict), R(1), U8(0),
-                B(JumpIfTrue), U8(64),
+                B(JumpIfTrue), U8(68),
                 B(LdaSmi), U8(1),
                 B(TestEqualStrict), R(1), U8(0),
                 B(JumpIfTrueConstant), U8(0),
@@ -139,16 +139,16 @@ bytecodes: [
                 B(CreateFunctionContext), U8(2),
                 B(PushContext), R(0),
                 B(Ldar), R(this),
-                B(StaContextSlot), R(context), U8(4),
+                B(StaContextSlot), R(context), U8(4), U8(0),
   /*   11 E> */ B(StackCheck),
                 B(Mov), R(context), R(4),
-  /*   11 E> */ B(LdrContextSlot), R(context), U8(4), R(6),
+  /*   11 E> */ B(LdrContextSlot), R(context), U8(4), U8(0), R(6),
                 B(Ldar), R(6),
                 B(Mov), R(closure), R(5),
                 B(CallRuntime), U16(Runtime::kCreateJSGeneratorObject), R(5), U8(2),
-                B(StaContextSlot), R(context), U8(5),
+                B(StaContextSlot), R(context), U8(5), U8(0),
                 B(Star), R(5),
-                B(LdrContextSlot), R(context), U8(5), R(6),
+                B(LdrContextSlot), R(context), U8(5), U8(0), R(6),
                 B(LdaZero),
                 B(SuspendGenerator), R(6),
                 B(Ldar), R(5),
@@ -173,7 +173,7 @@ bytecodes: [
                 B(Star), R(3),
                 B(LdaZero),
                 B(Star), R(2),
-                B(Jump), U8(115),
+                B(Jump), U8(116),
                 B(Ldar), R(7),
   /*   11 E> */ B(Throw),
   /*   16 S> */ B(LdaSmi), U8(42),
@@ -182,7 +182,7 @@ bytecodes: [
                 B(Star), R(6),
                 B(CallRuntime), U16(Runtime::k_CreateIterResultObject), R(5), U8(2),
                 B(Star), R(7),
-                B(LdrContextSlot), R(context), U8(5), R(5),
+                B(LdrContextSlot), R(context), U8(5), U8(0), R(5),
                 B(LdaSmi), U8(1),
                 B(SuspendGenerator), R(5),
                 B(Ldar), R(7),
@@ -226,7 +226,7 @@ bytecodes: [
                 B(Star), R(2),
                 B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
                 B(Star), R(4),
-                B(LdrContextSlot), R(context), U8(5), R(5),
+                B(LdrContextSlot), R(context), U8(5), U8(0), R(5),
                 B(CallRuntime), U16(Runtime::k_GeneratorClose), R(5), U8(1),
                 B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(4), U8(1),
                 B(LdaZero),
@@ -254,10 +254,10 @@ bytecodes: [
   /*   25 S> */ B(Return),
 ]
 constant pool: [
-  Smi [136],
+  Smi [141],
 ]
 handlers: [
-  [47, 228, 234],
+  [48, 233, 239],
 ]
 
 ---
@@ -267,7 +267,7 @@ snippet: "
 "
 frame size: 18
 parameter count: 1
-bytecode array length: 765
+bytecode array length: 805
 bytecodes: [
                 B(Ldar), R(new_target),
                 B(JumpIfUndefined), U8(28),
@@ -275,7 +275,7 @@ bytecodes: [
                 B(Star), R(4),
                 B(LdaZero),
                 B(TestEqualStrict), R(4), U8(0),
-                B(JumpIfTrue), U8(64),
+                B(JumpIfTrue), U8(68),
                 B(LdaSmi), U8(1),
                 B(TestEqualStrict), R(4), U8(0),
                 B(JumpIfTrueConstant), U8(3),
@@ -287,16 +287,16 @@ bytecodes: [
                 B(CreateFunctionContext), U8(9),
                 B(PushContext), R(0),
                 B(Ldar), R(this),
-                B(StaContextSlot), R(context), U8(4),
+                B(StaContextSlot), R(context), U8(4), U8(0),
   /*   11 E> */ B(StackCheck),
                 B(Mov), R(context), R(7),
-  /*   11 E> */ B(LdrContextSlot), R(context), U8(4), R(9),
+  /*   11 E> */ B(LdrContextSlot), R(context), U8(4), U8(0), R(9),
                 B(Ldar), R(9),
                 B(Mov), R(closure), R(8),
                 B(CallRuntime), U16(Runtime::kCreateJSGeneratorObject), R(8), U8(2),
-                B(StaContextSlot), R(context), U8(5),
+                B(StaContextSlot), R(context), U8(5), U8(0),
                 B(Star), R(8),
-                B(LdrContextSlot), R(context), U8(5), R(9),
+                B(LdrContextSlot), R(context), U8(5), U8(0), R(9),
                 B(LdaZero),
                 B(SuspendGenerator), R(9),
                 B(Ldar), R(8),
@@ -321,16 +321,16 @@ bytecodes: [
                 B(Star), R(6),
                 B(LdaZero),
                 B(Star), R(5),
-                B(JumpConstant), U8(19),
+                B(JumpConstant), U8(20),
                 B(Ldar), R(10),
   /*   11 E> */ B(Throw),
                 B(Ldar), R(closure),
                 B(CreateBlockContext), U8(0),
                 B(PushContext), R(1),
                 B(LdaTheHole),
-                B(StaContextSlot), R(context), U8(4),
+                B(StaContextSlot), R(context), U8(4), U8(0),
                 B(LdaZero),
-                B(StaContextSlot), R(1), U8(9),
+                B(StaContextSlot), R(1), U8(9), U8(0),
                 B(Mov), R(context), R(10),
                 B(Mov), R(context), R(11),
   /*   30 S> */ B(CreateArrayLiteral), U8(1), U8(0), U8(1),
@@ -338,7 +338,7 @@ bytecodes: [
                 B(LdaConstant), U8(2),
   /*   30 E> */ B(LdrKeyedProperty), R(13), U8(3), R(12),
   /*   30 E> */ B(Call), R(12), R(13), U8(1), U8(1),
-  /*   30 E> */ B(StaContextSlot), R(1), U8(7),
+  /*   30 E> */ B(StaContextSlot), R(1), U8(7), U8(0),
                 B(LdaSmi), U8(-2),
                 B(TestEqual), R(4), U8(0),
                 B(JumpIfTrue), U8(18),
@@ -348,35 +348,35 @@ bytecodes: [
                 B(LdaSmi), U8(76),
                 B(Star), R(12),
                 B(CallRuntime), U16(Runtime::kAbort), R(12), U8(1),
-  /*   27 S> */ B(LdrContextSlot), R(1), U8(7), R(14),
+  /*   27 S> */ B(LdrContextSlot), R(1), U8(7), U8(0), R(14),
                 B(LdrNamedProperty), R(14), U8(4), U8(7), R(13),
   /*   27 E> */ B(Call), R(13), R(14), U8(1), U8(5),
-  /*   27 E> */ B(StaContextSlot), R(1), U8(8),
+  /*   27 E> */ B(StaContextSlot), R(1), U8(8), U8(0),
                 B(Star), R(12),
                 B(InvokeIntrinsic), U8(Runtime::k_IsJSReceiver), R(12), U8(1),
                 B(ToBooleanLogicalNot),
-                B(JumpIfFalse), U8(11),
-                B(LdrContextSlot), R(1), U8(8), R(12),
+                B(JumpIfFalse), U8(12),
+                B(LdrContextSlot), R(1), U8(8), U8(0), R(12),
                 B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(12), U8(1),
-                B(LdrContextSlot), R(1), U8(8), R(12),
+                B(LdrContextSlot), R(1), U8(8), U8(0), R(12),
                 B(LdaNamedProperty), R(12), U8(5), U8(9),
                 B(JumpIfToBooleanTrueConstant), U8(10),
-                B(LdrContextSlot), R(1), U8(8), R(12),
+                B(LdrContextSlot), R(1), U8(8), U8(0), R(12),
                 B(LdaNamedProperty), R(12), U8(6), U8(11),
-                B(StaContextSlot), R(1), U8(10),
+                B(StaContextSlot), R(1), U8(10), U8(0),
                 B(LdaSmi), U8(2),
-                B(StaContextSlot), R(1), U8(9),
-                B(LdaContextSlot), R(1), U8(10),
-                B(StaContextSlot), R(1), U8(6),
+                B(StaContextSlot), R(1), U8(9), U8(0),
+                B(LdaContextSlot), R(1), U8(10), U8(0),
+                B(StaContextSlot), R(1), U8(6), U8(0),
   /*   16 E> */ B(StackCheck),
                 B(Ldar), R(closure),
                 B(CreateBlockContext), U8(7),
                 B(PushContext), R(2),
                 B(LdaTheHole),
-                B(StaContextSlot), R(context), U8(4),
-                B(LdaContextSlot), R(1), U8(6),
-                B(StaContextSlot), R(context), U8(4),
-  /*   36 S> */ B(LdaContextSlot), R(context), U8(4),
+                B(StaContextSlot), R(context), U8(4), U8(0),
+                B(LdaContextSlot), R(1), U8(6), U8(0),
+                B(StaContextSlot), R(context), U8(4), U8(0),
+  /*   36 S> */ B(LdaContextSlot), R(context), U8(4), U8(0),
                 B(JumpIfNotHole), U8(11),
                 B(LdaConstant), U8(8),
                 B(Star), R(13),
@@ -386,7 +386,7 @@ bytecodes: [
                 B(Star), R(13),
                 B(CallRuntime), U16(Runtime::k_CreateIterResultObject), R(12), U8(2),
                 B(Star), R(14),
-                B(LdrContextSlot), R(1), U8(5), R(12),
+                B(LdrContextSlot), R(1), U8(5), U8(0), R(12),
                 B(LdaSmi), U8(1),
                 B(SuspendGenerator), R(12),
                 B(Ldar), R(14),
@@ -417,27 +417,27 @@ bytecodes: [
                 B(Star), R(9),
                 B(LdaZero),
                 B(Star), R(8),
-                B(Jump), U8(70),
+                B(Jump), U8(74),
                 B(Ldar), R(13),
   /*   36 E> */ B(Throw),
                 B(Ldar), R(13),
                 B(PopContext), R(2),
                 B(LdaZero),
-                B(StaContextSlot), R(1), U8(9),
-                B(Wide), B(Jump), U16(-219),
-                B(Jump), U8(41),
+                B(StaContextSlot), R(1), U8(9), U8(0),
+                B(Wide), B(Jump), U16(-234),
+                B(Jump), U8(44),
                 B(Star), R(12),
                 B(Ldar), R(closure),
                 B(CreateCatchContext), R(12), U8(11), U8(12),
                 B(Star), R(11),
                 B(PushContext), R(2),
-                B(LdrContextSlot), R(0), U8(9), R(12),
+                B(LdrContextSlot), R(0), U8(9), U8(0), R(12),
                 B(LdaSmi), U8(2),
                 B(TestEqualStrict), R(12), U8(13),
-                B(JumpIfFalse), U8(7),
+                B(JumpIfFalse), U8(8),
                 B(LdaSmi), U8(1),
-                B(StaContextSlot), R(0), U8(9),
-                B(LdrContextSlot), R(context), U8(4), R(12),
+                B(StaContextSlot), R(0), U8(9), U8(0),
+                B(LdrContextSlot), R(context), U8(4), U8(0), R(12),
                 B(CallRuntime), U16(Runtime::kReThrow), R(12), U8(1),
                 B(PopContext), R(2),
                 B(LdaSmi), U8(-1),
@@ -448,27 +448,27 @@ bytecodes: [
                 B(Star), R(8),
                 B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
                 B(Star), R(10),
-                B(LdrContextSlot), R(1), U8(9), R(11),
+                B(LdrContextSlot), R(1), U8(9), U8(0), R(11),
                 B(LdaZero),
                 B(TestEqualStrict), R(11), U8(14),
-                B(JumpIfTrueConstant), U8(17),
-                B(LdrContextSlot), R(1), U8(7), R(11),
+                B(JumpIfTrueConstant), U8(18),
+                B(LdrContextSlot), R(1), U8(7), U8(0), R(11),
                 B(LdaUndefined),
                 B(TestEqualStrict), R(11), U8(15),
-                B(JumpIfTrueConstant), U8(18),
-                B(LdrContextSlot), R(1), U8(7), R(11),
+                B(JumpIfTrueConstant), U8(19),
+                B(LdrContextSlot), R(1), U8(7), U8(0), R(11),
                 B(LdaNamedProperty), R(11), U8(13), U8(16),
-                B(StaContextSlot), R(1), U8(11),
-                B(LdrContextSlot), R(1), U8(11), R(11),
+                B(StaContextSlot), R(1), U8(11), U8(0),
+                B(LdrContextSlot), R(1), U8(11), U8(0), R(11),
                 B(LdaNull),
                 B(TestEqual), R(11), U8(18),
                 B(JumpIfFalse), U8(4),
-                B(Jump), U8(120),
-                B(LdrContextSlot), R(1), U8(9), R(11),
+                B(JumpConstant), U8(17),
+                B(LdrContextSlot), R(1), U8(9), U8(0), R(11),
                 B(LdaSmi), U8(1),
                 B(TestEqualStrict), R(11), U8(19),
-                B(JumpIfFalse), U8(73),
-                B(LdaContextSlot), R(1), U8(11),
+                B(JumpIfFalse), U8(76),
+                B(LdaContextSlot), R(1), U8(11), U8(0),
                 B(TypeOf),
                 B(Star), R(11),
                 B(LdaConstant), U8(14),
@@ -482,8 +482,8 @@ bytecodes: [
                 B(CallRuntime), U16(Runtime::kNewTypeError), R(11), U8(2),
                 B(Throw),
                 B(Mov), R(context), R(11),
-                B(LdrContextSlot), R(1), U8(11), R(12),
-                B(LdrContextSlot), R(1), U8(7), R(13),
+                B(LdrContextSlot), R(1), U8(11), U8(0), R(12),
+                B(LdrContextSlot), R(1), U8(7), U8(0), R(13),
                 B(InvokeIntrinsic), U8(Runtime::k_Call), R(12), U8(2),
                 B(Jump), U8(23),
                 B(Star), R(12),
@@ -494,16 +494,16 @@ bytecodes: [
                 B(Ldar), R(11),
                 B(PushContext), R(2),
                 B(PopContext), R(2),
-                B(Jump), U8(38),
-                B(LdrContextSlot), R(1), U8(11), R(11),
-                B(LdrContextSlot), R(1), U8(7), R(12),
+                B(Jump), U8(43),
+                B(LdrContextSlot), R(1), U8(11), U8(0), R(11),
+                B(LdrContextSlot), R(1), U8(7), U8(0), R(12),
                 B(InvokeIntrinsic), U8(Runtime::k_Call), R(11), U8(2),
-                B(StaContextSlot), R(1), U8(12),
-                B(LdrContextSlot), R(1), U8(12), R(11),
+                B(StaContextSlot), R(1), U8(12), U8(0),
+                B(LdrContextSlot), R(1), U8(12), U8(0), R(11),
                 B(InvokeIntrinsic), U8(Runtime::k_IsJSReceiver), R(11), U8(1),
                 B(JumpIfToBooleanFalse), U8(4),
-                B(Jump), U8(11),
-                B(LdrContextSlot), R(1), U8(12), R(11),
+                B(Jump), U8(12),
+                B(LdrContextSlot), R(1), U8(12), U8(0), R(11),
                 B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(11), U8(1),
                 B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(10), U8(1),
                 B(LdaZero),
@@ -542,7 +542,7 @@ bytecodes: [
                 B(Star), R(5),
                 B(CallRuntime), U16(Runtime::kInterpreterClearPendingMessage), R(0), U8(0),
                 B(Star), R(7),
-                B(LdrContextSlot), R(context), U8(5), R(8),
+                B(LdrContextSlot), R(context), U8(5), U8(0), R(8),
                 B(CallRuntime), U16(Runtime::k_GeneratorClose), R(8), U8(1),
                 B(CallRuntime), U16(Runtime::kInterpreterSetPendingMessage), R(7), U8(1),
                 B(LdaZero),
@@ -578,28 +578,29 @@ constant pool: [
   FIXED_ARRAY_TYPE,
   FIXED_ARRAY_TYPE,
   SYMBOL_TYPE,
-  Smi [151],
+  Smi [158],
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["next"],
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["done"],
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["value"],
   FIXED_ARRAY_TYPE,
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
-  Smi [132],
-  Smi [156],
+  Smi [146],
+  Smi [167],
   ONE_BYTE_INTERNALIZED_STRING_TYPE [".catch"],
   FIXED_ARRAY_TYPE,
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["return"],
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["function"],
   ONE_BYTE_INTERNALIZED_STRING_TYPE [""],
   FIXED_ARRAY_TYPE,
-  Smi [153],
-  Smi [143],
-  Smi [566],
+  Smi [129],
+  Smi [166],
+  Smi [155],
+  Smi [601],
 ]
 handlers: [
-  [47, 679, 685],
-  [147, 433, 439],
-  [150, 392, 394],
-  [540, 552, 554],
+  [48, 718, 724],
+  [153, 458, 464],
+  [156, 414, 416],
+  [572, 586, 588],
 ]