[wasm] Atomic Wait/Notify should pass in the correct context value

dtig · Commit Bot · commit 9cbdca5a4e70 · 2019-11-20T09:31:50.000Z
Bug: chromium:1010272 Change-Id: Ifc7ed5ff66b84e889668fd0820cea1d5b6af328f Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1925809 Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Commit-Queue: Deepti Gandluri <gdeepti@chromium.org> Cr-Commit-Position: refs/heads/master@{#65060}
diff --git a/src/builtins/builtins-wasm-gen.cc b/src/builtins/builtins-wasm-gen.cc
@@ -76,10 +76,11 @@ TF_BUILTIN(WasmAtomicNotify, WasmBuiltinsAssembler) {
   TNode<Object> instance = LoadInstanceFromFrame();
   TNode<Number> address_number = ChangeUint32ToTagged(address);
   TNode<Number> count_number = ChangeUint32ToTagged(count);
+  TNode<Object> context = LoadContextFromInstance(instance);
 
-  TNode<Smi> result_smi = UncheckedCast<Smi>(
-      CallRuntime(Runtime::kWasmAtomicNotify, NoContextConstant(), instance,
-                  address_number, count_number));
+  TNode<Smi> result_smi =
+      UncheckedCast<Smi>(CallRuntime(Runtime::kWasmAtomicNotify, context,
+                                     instance, address_number, count_number));
   ReturnRaw(SmiToInt32(result_smi));
 }
 
@@ -95,9 +96,10 @@ TF_BUILTIN(WasmI32AtomicWait, WasmBuiltinsAssembler) {
   TNode<Number> address_number = ChangeUint32ToTagged(address);
   TNode<Number> expected_value_number = ChangeInt32ToTagged(expected_value);
   TNode<Number> timeout_number = ChangeFloat64ToTagged(timeout);
+  TNode<Object> context = LoadContextFromInstance(instance);
 
   TNode<Smi> result_smi = UncheckedCast<Smi>(
-      CallRuntime(Runtime::kWasmI32AtomicWait, NoContextConstant(), instance,
+      CallRuntime(Runtime::kWasmI32AtomicWait, context, instance,
                   address_number, expected_value_number, timeout_number));
   ReturnRaw(SmiToInt32(result_smi));
 }
@@ -119,11 +121,11 @@ TF_BUILTIN(WasmI64AtomicWait, WasmBuiltinsAssembler) {
   TNode<Number> expected_value_low_number =
       ChangeUint32ToTagged(expected_value_low);
   TNode<Number> timeout_number = ChangeFloat64ToTagged(timeout);
+  TNode<Object> context = LoadContextFromInstance(instance);
 
-  TNode<Smi> result_smi = UncheckedCast<Smi>(
-      CallRuntime(Runtime::kWasmI64AtomicWait, NoContextConstant(), instance,
-                  address_number, expected_value_high_number,
-                  expected_value_low_number, timeout_number));
+  TNode<Smi> result_smi = UncheckedCast<Smi>(CallRuntime(
+      Runtime::kWasmI64AtomicWait, context, instance, address_number,
+      expected_value_high_number, expected_value_low_number, timeout_number));
   ReturnRaw(SmiToInt32(result_smi));
 }
 
