[Interpreter] Fix cctest/test-bytecode-generator/IfConditions.

test/cctest/interpreter/test-bytecode-generator.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/compiler.h"
 #include "src/interpreter/bytecode-array-iterator.h"
 #include "src/interpreter/bytecode-generator.h"
 #include "src/interpreter/interpreter.h"
@@ skipping 771 matching lines @@
         B(Return),              //
         B(LdaUndefined),        //
         B(Return)},             //
        0,
        {unused, unused, unused, unused}},
       {"function f(a) { if (a <= 0) { return 200; } else { return -200; } }"
        "f(99);",
        kPointerSize,
        2,
        19,
-       {B(Ldar), R(-5),                //
-        B(Star), R(0),                 //
-        B(LdaZero),                    //
-        B(TestLessThanOrEqual), R(0),  //
-        B(JumpIfFalse), U8(7),         //
-        B(LdaConstant), U8(0),         //
-        B(Return),                     //
+       {B(Ldar), R(helper.kLastParamIndex),  //
+        B(Star), R(0),                       //
+        B(LdaZero),                          //
+        B(TestLessThanOrEqual), R(0),        //
+        B(JumpIfFalse), U8(7),               //
+        B(LdaConstant), U8(0),               //
+        B(Return),                           //
         B(Jump), U8(5),         // TODO(oth): Unreachable jump after return
         B(LdaConstant), U8(1),  //
         B(Return),              //
         B(LdaUndefined),        //
         B(Return)},             //
        2,
        {helper.factory()->NewNumberFromInt(200),
         helper.factory()->NewNumberFromInt(-200), unused, unused}},
       {"function f(a, b) { if (a in b) { return 200; } }"
        "f('prop', { prop: 'yes'});",
        kPointerSize,
        3,
        17,
-       {B(Ldar), R(-6),         //
-        B(Star), R(0),          //
-        B(Ldar), R(-5),         //
-        B(TestIn), R(0),        //
-        B(JumpIfFalse), U8(7),  //
-        B(LdaConstant), U8(0),  //
-        B(Return),              //
-        B(Jump), U8(2),         // TODO(oth): Unreachable jump after return
-        B(LdaUndefined),        //
-        B(Return)},             //
+       {B(Ldar), R(helper.kLastParamIndex - 1),  //
+        B(Star), R(0),                           //
+        B(Ldar), R(helper.kLastParamIndex),      //
+        B(TestIn), R(0),                         //
+        B(JumpIfFalse), U8(7),                   //
+        B(LdaConstant), U8(0),                   //
+        B(Return),                               //
+        B(Jump), U8(2),   // TODO(oth): Unreachable jump after return
+        B(LdaUndefined),  //
+        B(Return)},       //
        1,
        {helper.factory()->NewNumberFromInt(200), unused, unused, unused}},
       {"function f(z) { var a = 0; var b = 0; if (a === 0.01) { "
 #define X "b = a; a = b; "
        X X X X X X X X X X X X X X X X X X X X X X X X
 #undef X
        " return 200; } else { return -200; } } f(0.001)",
        3 * kPointerSize,
        2,
        218,
@@ skipping 32 matching lines @@
        "  if (a in b) { return 1; }\n"
        "  if (a instanceof b) { return 1; }\n"
        "  /* if (a != b) { return 1; } */"   // TODO(oth) Ast visitor yields
        "  /* if (a !== b) { return 1; } */"  // UNARY NOT, rather than !=/!==.
        "  return 0;\n"
        "} f(1, 1);",
        kPointerSize,
        3,
        122,
        {
-#define IF_CONDITION_RETURN(condition) \
-  B(Ldar), R(-6),                      \
-  B(Star), R(0),                       \
-  B(Ldar), R(-5),                      \
-  B(condition), R(0),                  \
-  B(JumpIfFalse), U8(7),               \
-  B(LdaSmi8), U8(1),                   \
-  B(Return),                           \
+#define IF_CONDITION_RETURN(condition)    \
+  B(Ldar), R(helper.kLastParamIndex - 1), \
+  B(Star), R(0),                          \
+  B(Ldar), R(helper.kLastParamIndex),     \
+  B(condition), R(0),                     \
+  B(JumpIfFalse), U8(7),                  \
+  B(LdaSmi8), U8(1),                      \
+  B(Return),                              \
   B(Jump), U8(2),
            IF_CONDITION_RETURN(TestEqual)               //
            IF_CONDITION_RETURN(TestEqualStrict)         //
            IF_CONDITION_RETURN(TestLessThan)            //
            IF_CONDITION_RETURN(TestGreaterThan)         //
            IF_CONDITION_RETURN(TestLessThanOrEqual)     //
            IF_CONDITION_RETURN(TestGreaterThanOrEqual)  //
            IF_CONDITION_RETURN(TestIn)                  //
            IF_CONDITION_RETURN(TestInstanceOf)          //
 #undef IF_CONDITION_RETURN
            B(LdaZero),  //
            B(Return)},  //
        0,
        {unused, unused, unused, unused}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     Handle<BytecodeArray> bytecode_array =
         helper.MakeBytecode(snippets[i].code_snippet, helper.kFunctionName);
     CheckBytecodeArrayEqual(snippets[i], bytecode_array);
   }
 }
 
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8