Index: src/runtime/runtime-wasm.cc |
diff --git a/src/runtime/runtime-wasm.cc b/src/runtime/runtime-wasm.cc |
index dd9cf7783e413d84a0b31f1734114efe18d1c4ca..1c737aeeee3b38e7499aed33242f1ec29b9fce99 100644 |
--- a/src/runtime/runtime-wasm.cc |
+++ b/src/runtime/runtime-wasm.cc |
@@ -169,6 +169,9 @@ RUNTIME_FUNCTION(Runtime_WasmRunInterpreter) { |
CHECK(arg_buffer_obj->IsSmi()); |
uint8_t* arg_buffer = reinterpret_cast<uint8_t*>(*arg_buffer_obj); |
+ // Reset the current isolate's context. |
+ isolate->set_context(*instance->compiled_module()->native_context()); |
titzer
2017/01/25 10:04:09
Do we need to set it back when returning, or will
Yang
2017/01/25 10:12:22
We have a SaveContext scope. Is that something you
Clemens Hammacher
2017/01/25 11:41:57
I am not sure if resetting is needed, but since th
|
+ |
instance->debug_info()->RunInterpreter(func_index, arg_buffer); |
return isolate->heap()->undefined_value(); |
} |