[Interpreter] Maintain a pointer to the current position in the bytecode

test/unittests/interpreter/interpreter-assembler-unittest.cc

Index: test/unittests/interpreter/interpreter-assembler-unittest.cc
diff --git a/test/unittests/interpreter/interpreter-assembler-unittest.cc b/test/unittests/interpreter/interpreter-assembler-unittest.cc
index 1bc80c0e4a7eeb635cd881c1a87eb9fdfdb77bfa..c76da5416e9dd50c629c6167401930dd0d04c26e 100644
--- a/test/unittests/interpreter/interpreter-assembler-unittest.cc
+++ b/test/unittests/interpreter/interpreter-assembler-unittest.cc
@@ -93,10 +93,10 @@ InterpreterAssemblerTest::InterpreterAssemblerForTest::IsUnsignedByteOperand(
     int offset) {
   return IsLoad(
       MachineType::Uint8(),
-      IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
       IsIntPtrAdd(
-          IsParameter(InterpreterDispatchDescriptor::kBytecodeOffsetParameter),
-          IsIntPtrConstant(offset)));
+          IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
+          IsParameter(InterpreterDispatchDescriptor::kBytecodeOffsetParameter)),
+      IsIntPtrConstant(offset));
 }
 
 Matcher<Node*>
@@ -104,10 +104,10 @@ InterpreterAssemblerTest::InterpreterAssemblerForTest::IsSignedByteOperand(
     int offset) {
   Matcher<Node*> load_matcher = IsLoad(
       MachineType::Int8(),
-      IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
       IsIntPtrAdd(
-          IsParameter(InterpreterDispatchDescriptor::kBytecodeOffsetParameter),
-          IsIntPtrConstant(offset)));
+          IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
+          IsParameter(InterpreterDispatchDescriptor::kBytecodeOffsetParameter)),
+      IsIntPtrConstant(offset));
   if (kPointerSize == 8) {
     load_matcher = IsChangeInt32ToInt64(load_matcher);
   }
@@ -120,11 +120,11 @@ InterpreterAssemblerTest::InterpreterAssemblerForTest::IsUnsignedShortOperand(
   if (TargetSupportsUnalignedAccess()) {
     return IsLoad(
         MachineType::Uint16(),
-        IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
         IsIntPtrAdd(
+            IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
             IsParameter(
-                InterpreterDispatchDescriptor::kBytecodeOffsetParameter),
-            IsIntPtrConstant(offset)));
+                InterpreterDispatchDescriptor::kBytecodeOffsetParameter)),
+        IsIntPtrConstant(offset));
   } else {
 #if V8_TARGET_LITTLE_ENDIAN
     const int kStep = -1;
@@ -139,11 +139,12 @@ InterpreterAssemblerTest::InterpreterAssemblerForTest::IsUnsignedShortOperand(
     for (int i = 0; i < static_cast<int>(arraysize(bytes)); i++) {
       bytes[i] = IsLoad(
           MachineType::Uint8(),
-          IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
           IsIntPtrAdd(
               IsParameter(
-                  InterpreterDispatchDescriptor::kBytecodeOffsetParameter),
-              IsIntPtrConstant(offset + kMsbOffset + kStep * i)));
+                  InterpreterDispatchDescriptor::kBytecodeArrayParameter),
+              IsParameter(
+                  InterpreterDispatchDescriptor::kBytecodeOffsetParameter)),
+          IsIntPtrConstant(offset + kMsbOffset + kStep * i));
     }
     return IsWord32Or(IsWord32Shl(bytes[0], IsInt32Constant(kBitsPerByte)),
                       bytes[1]);
@@ -157,11 +158,11 @@ InterpreterAssemblerTest::InterpreterAssemblerForTest::IsSignedShortOperand(
   if (TargetSupportsUnalignedAccess()) {
     load_matcher = IsLoad(
         MachineType::Int16(),
-        IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
         IsIntPtrAdd(
+            IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
             IsParameter(
-                InterpreterDispatchDescriptor::kBytecodeOffsetParameter),
-            IsIntPtrConstant(offset)));
+                InterpreterDispatchDescriptor::kBytecodeOffsetParameter)),
+        IsIntPtrConstant(offset));
   } else {
 #if V8_TARGET_LITTLE_ENDIAN
     const int kStep = -1;
@@ -198,11 +199,11 @@ InterpreterAssemblerTest::InterpreterAssemblerForTest::IsUnsignedQuadOperand(
   if (TargetSupportsUnalignedAccess()) {
     return IsLoad(
         MachineType::Uint32(),
-        IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
         IsIntPtrAdd(
+            IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
             IsParameter(
-                InterpreterDispatchDescriptor::kBytecodeOffsetParameter),
-            IsIntPtrConstant(offset)));
+                InterpreterDispatchDescriptor::kBytecodeOffsetParameter)),
+        IsIntPtrConstant(offset));
   } else {
 #if V8_TARGET_LITTLE_ENDIAN
     const int kStep = -1;
@@ -239,11 +240,11 @@ InterpreterAssemblerTest::InterpreterAssemblerForTest::IsSignedQuadOperand(
   if (TargetSupportsUnalignedAccess()) {
     load_matcher = IsLoad(
         MachineType::Int32(),
-        IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
         IsIntPtrAdd(
+            IsParameter(InterpreterDispatchDescriptor::kBytecodeArrayParameter),
             IsParameter(
-                InterpreterDispatchDescriptor::kBytecodeOffsetParameter),
-            IsIntPtrConstant(offset)));
+                InterpreterDispatchDescriptor::kBytecodeOffsetParameter)),
+        IsIntPtrConstant(offset));
   } else {
 #if V8_TARGET_LITTLE_ENDIAN
     const int kStep = -1;