[wasm] Fix nondeterministic Win64 failures

test/cctest/wasm/wasm-run-utils.h

 // Copyright 2016 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.
 
 #ifndef WASM_RUN_UTILS_H
 #define WASM_RUN_UTILS_H
 
 #include <setjmp.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ skipping 648 matching lines @@
     }
   }
 
   ReturnType Call(ParamTypes... p) {
     DCHECK(compiled_);
     if (interpret()) return CallInterpreter(p...);
 
     // Use setjmp/longjmp to deal with traps in WebAssembly code.
     // Make the return value volatile, to give defined semantics if accessed
     // after setjmp.
-    volatile ReturnType return_value =
-        static_cast<ReturnType>(0xdeadbeefdeadbeef);
-    int jump_value = setjmp(WasmRunnerBase::jump_buffer);
-    // jump_value == 0 --> first return; jump_value == 1 --> longjmp happened.
-    if (!jump_value) DoCall(&return_value, p...);
+    ReturnType return_value = static_cast<ReturnType>(0xdeadbeefdeadbeef);
+    static int setjmp_ret;
+    setjmp_ret = setjmp(WasmRunnerBase::jump_buffer);
+    // setjmp returns 0 on the first return, 1 (passed to longjmp) after trap.
+    if (setjmp_ret == 0) {
+      DoCall(static_cast<void*>(&p)..., static_cast<void*>(&return_value));
+    }
     return return_value;
   }
 
   ReturnType CallInterpreter(ParamTypes... p) {
     WasmInterpreter::Thread* thread = interpreter()->GetThread(0);
     thread->Reset();
     std::array<WasmVal, sizeof...(p)> args{{WasmVal(p)...}};
     thread->PushFrame(function(), args.data());
     if (thread->Run() == WasmInterpreter::FINISHED) {
       WasmVal val = thread->GetReturnValue();
       possible_nondeterminism_ |= thread->PossibleNondeterminism();
       return val.to<ReturnType>();
     } else if (thread->state() == WasmInterpreter::TRAPPED) {
       // TODO(titzer): return the correct trap code
       int64_t result = 0xdeadbeefdeadbeef;
       return static_cast<ReturnType>(result);
     } else {
       // TODO(titzer): falling off end
       return ReturnType{0};
     }
   }
 
  private:
   // Don't inline this function. The setjmp above should be followed immediately
   // by a call.
-  V8_NOINLINE void DoCall(volatile ReturnType* return_value, ParamTypes... p) {
+  template <typename... Ptrs>
+  V8_NOINLINE void DoCall(Ptrs... ptrs) {
     auto trap_callback = []() -> void {
       set_trap_callback_for_testing(nullptr);
       longjmp(WasmRunnerBase::jump_buffer, 1);
     };
     set_trap_callback_for_testing(trap_callback);
 
     wrapper_.SetInnerCode(
         module_.GetFunctionCode(functions_[0]->function_index()));
     CodeRunner<int32_t> runner(CcTest::InitIsolateOnce(),
                                wrapper_.GetWrapperCode(), wrapper_.signature());
-    ReturnType return_value_local;
-    int32_t result = runner.Call(static_cast<void*>(&p)...,
-                                 static_cast<void*>(&return_value_local));
-    *return_value = return_value_local;
+    int32_t result = runner.Call(ptrs...);
     // If we arrive here, no trap happened.
     CHECK_EQ(WASM_WRAPPER_RETURN_VALUE, result);
   }
 };
 
 // Declare static variable.
 jmp_buf WasmRunnerBase::jump_buffer;
 
 // A macro to define tests that run in different engine configurations.
 #define WASM_EXEC_TEST(name)                                               \
   void RunWasm_##name(WasmExecutionMode execution_mode);                   \
   TEST(RunWasmCompiled_##name) { RunWasm_##name(kExecuteCompiled); }       \
   TEST(RunWasmInterpreted_##name) { RunWasm_##name(kExecuteInterpreted); } \
   void RunWasm_##name(WasmExecutionMode execution_mode)
 
-#if V8_CC_MSVC
-#define WASM_EXEC_TEST_WITH_TRAP(name) WASM_EXEC_TEST(name)
-#else
 #define WASM_EXEC_TEST_WITH_TRAP(name)                                     \
   void RunWasm_##name(WasmExecutionMode execution_mode);                   \
   TEST(RunWasmCompiled_##name) { RunWasm_##name(kExecuteCompiled); }       \
   void RunWasm_##name(WasmExecutionMode execution_mode);                   \
   TEST(RunWasmCompiledWithTrapIf_##name) {                                 \
     bool trap_if = FLAG_wasm_trap_if;                                      \
     FLAG_wasm_trap_if = true;                                              \
     RunWasm_##name(kExecuteCompiled);                                      \
     FLAG_wasm_trap_if = trap_if;                                           \
   }                                                                        \
   TEST(RunWasmInterpreted_##name) { RunWasm_##name(kExecuteInterpreted); } \
   void RunWasm_##name(WasmExecutionMode execution_mode)
-#endif
 
 #define WASM_EXEC_COMPILED_TEST(name)                                \
   void RunWasm_##name(WasmExecutionMode execution_mode);             \
   TEST(RunWasmCompiled_##name) { RunWasm_##name(kExecuteCompiled); } \
   void RunWasm_##name(WasmExecutionMode execution_mode)
 
 }  // namespace
 
 #endif