[wasm] Implement polymorphic checking, matching the reference interpreter.

test/cctest/wasm/test-run-wasm.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 <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "src/base/platform/elapsed-timer.h"
 #include "src/utils.h"
@@ skipping 709 matching lines @@
 WASM_EXEC_TEST(Return12) {
   WasmRunner<int32_t> r(execution_mode);
 
   BUILD(r, RET_I8(12));
   CHECK_EQ(12, r.Call());
 }
 
 WASM_EXEC_TEST(Return17) {
   WasmRunner<int32_t> r(execution_mode);
 
-  BUILD(r, WASM_BLOCK(RET_I8(17)));
+  BUILD(r, WASM_BLOCK(RET_I8(17)), WASM_ZERO);
   CHECK_EQ(17, r.Call());
 }
 
 WASM_EXEC_TEST(Return_I32) {
   WasmRunner<int32_t, int32_t> r(execution_mode);
 
   BUILD(r, RET(WASM_GET_LOCAL(0)));
 
   FOR_INT32_INPUTS(i) { CHECK_EQ(*i, r.Call(*i)); }
 }
@@ skipping 88 matching lines @@
 WASM_EXEC_TEST(BrIf_strict) {
   WasmRunner<int32_t, int32_t> r(execution_mode);
   BUILD(r, WASM_BLOCK_I(WASM_BRV_IF(0, WASM_GET_LOCAL(0),
                                     WASM_TEE_LOCAL(0, WASM_I32V_2(99)))));
 
   FOR_INT32_INPUTS(i) { CHECK_EQ(*i, r.Call(*i)); }
 }
 
 WASM_EXEC_TEST(Br_height) {
   WasmRunner<int32_t, int32_t> r(execution_mode);
-  BUILD(r, WASM_BLOCK_I(WASM_BLOCK_I(WASM_BRV_IFD(0, WASM_GET_LOCAL(0),
-                                                  WASM_GET_LOCAL(0)),
-                                     WASM_RETURN1(WASM_I32V_1(9)),
-                                     WASM_I32V_1(7), WASM_I32V_1(7)),
-                        WASM_BRV(0, WASM_I32V_1(8))));
+  BUILD(r, WASM_BLOCK_I(
+               WASM_BLOCK(WASM_BRV_IFD(0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)),
+                          WASM_RETURN1(WASM_I32V_1(9))),
+               WASM_BRV(0, WASM_I32V_1(8))));
 
   for (int32_t i = 0; i < 5; i++) {
     int32_t expected = i != 0 ? 8 : 9;
     CHECK_EQ(expected, r.Call(i));
   }
 }
 
 WASM_EXEC_TEST(Regression_660262) {
   WasmRunner<int32_t> r(execution_mode);
   r.module().AddMemoryElems<int32_t>(8);
@@ skipping 416 matching lines @@
     CHECK_EQ(expected, r.Call(*i));
   }
 }
 
 WASM_EXEC_TEST(Block_IfElse_P_return) {
   WasmRunner<int32_t, int32_t> r(execution_mode);
   // if (p0) return 81; else return 82;
   BUILD(r,                               // --
         WASM_IF_ELSE(WASM_GET_LOCAL(0),  // --
                      RET_I8(81),         // --
-                     RET_I8(82)));       // --
+                     RET_I8(82)),        // --
+        WASM_ZERO);                      // --
   FOR_INT32_INPUTS(i) {
     int32_t expected = *i ? 81 : 82;
     CHECK_EQ(expected, r.Call(*i));
   }
 }
 
 WASM_EXEC_TEST(Block_If_P_assign) {
   WasmRunner<int32_t, int32_t> r(execution_mode);
   // { if (p0) p0 = 61; p0; }
   BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SET_LOCAL(0, WASM_I32V_1(61))),
         WASM_GET_LOCAL(0));
   FOR_INT32_INPUTS(i) {
     int32_t expected = *i ? 61 : *i;
     CHECK_EQ(expected, r.Call(*i));
   }
 }
 
-WASM_EXEC_TEST(DanglingAssign) {
-  WasmRunner<int32_t, int32_t> r(execution_mode);
-  // { return 0; p0 = 0; }
-  BUILD(r, B2(RET_I8(99), WASM_SET_LOCAL(0, WASM_ZERO)));
-  CHECK_EQ(99, r.Call(1));
-}
+// WASM_EXEC_TEST(DanglingAssign) {
+//  WasmRunner<int32_t, int32_t> r(execution_mode);
+//  // { return 0; p0 = 0; }
+//  BUILD(r, B2(RET_I8(99), WASM_SET_LOCAL(0, WASM_ZERO)));

[bradnelson, 2017/02/02 01:55:09]

Why?

[titzer, 2017/02/02 06:50:25]

Disabled these tests because this CL was based on unreachable code being
disallowed. Fixed.

+//  CHECK_EQ(99, r.Call(1));
+//}
 
 WASM_EXEC_TEST(ExprIf_P) {
   WasmRunner<int32_t, int32_t> r(execution_mode);
   // p0 ? 11 : 22;
   BUILD(r, WASM_IF_ELSE_I(WASM_GET_LOCAL(0),  // --
                           WASM_I32V_1(11),    // --
                           WASM_I32V_1(22)));  // --
   FOR_INT32_INPUTS(i) {
     int32_t expected = *i ? 11 : 22;
     CHECK_EQ(expected, r.Call(*i));
@@ skipping 74 matching lines @@
   WasmRunner<int32_t, int32_t> r(execution_mode);
   BUILD(r, B1(B1(WASM_LOOP(WASM_IF(WASM_GET_LOCAL(0), WASM_BR(2)),
                            WASM_SET_LOCAL(0, WASM_I32V_2(93))))),
         WASM_GET_LOCAL(0));
   CHECK_EQ(93, r.Call(0));
   CHECK_EQ(3, r.Call(3));
   CHECK_EQ(10001, r.Call(10001));
   CHECK_EQ(-22, r.Call(-22));
 }
 
-WASM_EXEC_TEST(IfBreak1) {
-  WasmRunner<int32_t, int32_t> r(execution_mode);
-  BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SEQ(WASM_BR(0), WASM_UNREACHABLE)),
-        WASM_I32V_2(91));
-  CHECK_EQ(91, r.Call(0));
-  CHECK_EQ(91, r.Call(1));
-  CHECK_EQ(91, r.Call(-8734));
-}
+// WASM_EXEC_TEST(IfBreak1) {
+//  WasmRunner<int32_t, int32_t> r(execution_mode);
+//  BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SEQ(WASM_BR(0), WASM_UNREACHABLE)),
+//        WASM_I32V_2(91));
+//  CHECK_EQ(91, r.Call(0));
+//  CHECK_EQ(91, r.Call(1));
+//  CHECK_EQ(91, r.Call(-8734));
+//}
 
-WASM_EXEC_TEST(IfBreak2) {
-  WasmRunner<int32_t, int32_t> r(execution_mode);
-  BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SEQ(WASM_BR(0), RET_I8(77))),
-        WASM_I32V_2(81));
-  CHECK_EQ(81, r.Call(0));
-  CHECK_EQ(81, r.Call(1));
-  CHECK_EQ(81, r.Call(-8734));
-}
+// WASM_EXEC_TEST(IfBreak2) {
+//  WasmRunner<int32_t, int32_t> r(execution_mode);
+//  BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SEQ(WASM_BR(0), RET_I8(77))),
+//        WASM_I32V_2(81));
+//  CHECK_EQ(81, r.Call(0));
+//  CHECK_EQ(81, r.Call(1));
+//  CHECK_EQ(81, r.Call(-8734));
+//}
 
 WASM_EXEC_TEST(LoadMemI32) {
   WasmRunner<int32_t, int32_t> r(execution_mode);
   int32_t* memory = r.module().AddMemoryElems<int32_t>(8);
   r.module().RandomizeMemory(1111);
 
   BUILD(r, WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO));
 
   r.module().WriteMemory(&memory[0], 99999999);
   CHECK_EQ(99999999, r.Call(0));
@@ skipping 332 matching lines @@
   double buffer[kSize] = {1, 2, 2, 2, 2, 2};
   double result =
       GenerateAndRunFold<double>(execution_mode, kExprF64Mul, buffer, kSize,
                                  kWasmF64, MachineType::Float64());
   CHECK_EQ(32, result);
 }
 
 WASM_EXEC_TEST(Build_Wasm_Infinite_Loop) {
   WasmRunner<int32_t, int32_t> r(execution_mode);
   // Only build the graph and compile, don't run.
-  BUILD(r, WASM_INFINITE_LOOP);
+  BUILD(r, WASM_INFINITE_LOOP, WASM_ZERO);
 }
 
 WASM_EXEC_TEST(Build_Wasm_Infinite_Loop_effect) {
   WasmRunner<int32_t, int32_t> r(execution_mode);
   r.module().AddMemoryElems<int8_t>(16);
 
   // Only build the graph and compile, don't run.
   BUILD(r, WASM_LOOP(WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO), WASM_DROP),
         WASM_ZERO);
 }
 
-WASM_EXEC_TEST(Unreachable0a) {
-  WasmRunner<int32_t, int32_t> r(execution_mode);
-  BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_I32V_1(9)), RET(WASM_GET_LOCAL(0))));
-  CHECK_EQ(9, r.Call(0));
-  CHECK_EQ(9, r.Call(1));
-}
+// WASM_EXEC_TEST(Unreachable0a) {
+//  WasmRunner<int32_t, int32_t> r(execution_mode);
+//  BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_I32V_1(9)), RET(WASM_GET_LOCAL(0))));
+//  CHECK_EQ(9, r.Call(0));

[bradnelson, 2017/02/02 01:55:09]

Why?

[titzer, 2017/02/02 06:50:25]

Ditto.

+//  CHECK_EQ(9, r.Call(1));
+//}
 
-WASM_EXEC_TEST(Unreachable0b) {
-  WasmRunner<int32_t, int32_t> r(execution_mode);
-  BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_I32V_1(7)), WASM_UNREACHABLE));
-  CHECK_EQ(7, r.Call(0));
-  CHECK_EQ(7, r.Call(1));
-}
+// WASM_EXEC_TEST(Unreachable0b) {
+//  WasmRunner<int32_t, int32_t> r(execution_mode);
+//  BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_I32V_1(7)), WASM_UNREACHABLE));
+//  CHECK_EQ(7, r.Call(0));
+//  CHECK_EQ(7, r.Call(1));
+//}
 
 TEST(Build_Wasm_Unreachable1) {
   WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
   BUILD(r, WASM_UNREACHABLE);
 }
 
-TEST(Build_Wasm_Unreachable2) {
-  WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
-  BUILD(r, WASM_UNREACHABLE, WASM_UNREACHABLE);
-}
+// TEST(Build_Wasm_Unreachable2) {
+//  WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
+//  BUILD(r, WASM_UNREACHABLE, WASM_UNREACHABLE);
+//}
 
-TEST(Build_Wasm_Unreachable3) {
-  WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
-  BUILD(r, WASM_UNREACHABLE, WASM_UNREACHABLE, WASM_UNREACHABLE);
-}
+// TEST(Build_Wasm_Unreachable3) {
+//  WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
+//  BUILD(r, WASM_UNREACHABLE, WASM_UNREACHABLE, WASM_UNREACHABLE);
+//}
 
-TEST(Build_Wasm_UnreachableIf1) {
-  WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
-  BUILD(r, WASM_UNREACHABLE, WASM_IF(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
-}
+// TEST(Build_Wasm_UnreachableIf1) {
+//  WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
+//  BUILD(r, WASM_UNREACHABLE, WASM_IF(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+//}
 
-TEST(Build_Wasm_UnreachableIf2) {
-  WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
-  BUILD(r, WASM_UNREACHABLE,
-        WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), WASM_UNREACHABLE));
-}
+// TEST(Build_Wasm_UnreachableIf2) {
+//  WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
+//  BUILD(r, WASM_UNREACHABLE,
+//        WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), WASM_UNREACHABLE));
+//}
 
-WASM_EXEC_TEST(Unreachable_Load) {
-  WasmRunner<int32_t, int32_t> r(execution_mode);
-  r.module().AddMemory(0L);
-  BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_GET_LOCAL(0)),
-                        WASM_LOAD_MEM(MachineType::Int8(), WASM_GET_LOCAL(0))));
-  CHECK_EQ(11, r.Call(11));
-  CHECK_EQ(21, r.Call(21));
+// WASM_EXEC_TEST(Unreachable_Load) {
+//  WasmRunner<int32_t, int32_t> r(execution_mode);
+//  BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_GET_LOCAL(0)),
+//                        WASM_LOAD_MEM(MachineType::Int8(),
+//                        WASM_GET_LOCAL(0))));
+//  CHECK_EQ(11, r.Call(11));
+//  CHECK_EQ(21, r.Call(21));
+//}
+
+WASM_EXEC_TEST(BrV_Fallthrough) {
+  WasmRunner<int32_t> r(execution_mode);
+  BUILD(r, WASM_BLOCK_I(WASM_BLOCK(WASM_BRV(1, WASM_I32V_1(42))),
+                        WASM_I32V_1(22)));
+  CHECK_EQ(42, r.Call());
 }
 
 WASM_EXEC_TEST(Infinite_Loop_not_taken1) {
   WasmRunner<int32_t, int32_t> r(execution_mode);
   BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_INFINITE_LOOP), WASM_I32V_1(45));
   // Run the code, but don't go into the infinite loop.
   CHECK_EQ(45, r.Call(0));
 }
 
 WASM_EXEC_TEST(Infinite_Loop_not_taken2) {
   WasmRunner<int32_t, int32_t> r(execution_mode);
-  BUILD(r, WASM_BLOCK_I(WASM_IF_ELSE(WASM_GET_LOCAL(0),
-                                     WASM_BRV(1, WASM_I32V_1(45)),
-                                     WASM_INFINITE_LOOP)));
+  BUILD(r, WASM_BLOCK_I(
+               WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_BRV(1, WASM_I32V_1(45)),
+                            WASM_INFINITE_LOOP),
+               WASM_ZERO));
   // Run the code, but don't go into the infinite loop.
   CHECK_EQ(45, r.Call(1));
 }
 
 WASM_EXEC_TEST(Infinite_Loop_not_taken2_brif) {
   WasmRunner<int32_t, int32_t> r(execution_mode);
   BUILD(r, WASM_BLOCK_I(WASM_BRV_IF(0, WASM_I32V_1(45), WASM_GET_LOCAL(0)),
                         WASM_INFINITE_LOOP));
   // Run the code, but don't go into the infinite loop.
   CHECK_EQ(45, r.Call(1));
@@ skipping 1026 matching lines @@
   BUILD(r, WASM_I32_REMS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)), WASM_DROP,
         WASM_ZERO);
   const int32_t kMin = std::numeric_limits<int32_t>::min();
   CHECK_EQ(0, r.Call(133, 100));
   CHECK_EQ(0, r.Call(kMin, -1));
   CHECK_EQ(0, r.Call(0, 1));
   CHECK_TRAP(r.Call(100, 0));
   CHECK_TRAP(r.Call(-1001, 0));
   CHECK_TRAP(r.Call(kMin, 0));
 }