Changeset 238976 in webkit

Timestamp:

Dec 7, 2018 4:24:56 PM (5 years ago)

Author:

Michael Catanzaro

Message:

Merge r238578 - [Re-landing] NaNs read from Wasm code needs to be be purified.
​https://bugs.webkit.org/show_bug.cgi?id=191056
<rdar://problem/45660341>

Reviewed by Filip Pizlo.

• wasm/js/WebAssemblyModuleRecord.cpp:

(JSC::WebAssemblyModuleRecord::link):

Location:

releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wasm/js/WebAssemblyModuleRecord.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-11-27  Mark Lam  <mark.lam@apple.com>
+
+        [Re-landing] NaNs read from Wasm code needs to be be purified.
+        https://bugs.webkit.org/show_bug.cgi?id=191056
+        <rdar://problem/45660341>
+
+        Reviewed by Filip Pizlo.
+
+        * wasm/js/WebAssemblyModuleRecord.cpp:
+        (JSC::WebAssemblyModuleRecord::link):
+
 2018-10-03  Mark Lam  <mark.lam@apple.com>
 

releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp

@@ -389 +389 @@
 
             case Wasm::F32:
-                exportedValue = JSValue(m_instance->instance().loadF32Global(exp.kindIndex));
+                exportedValue = jsNumber(purifyNaN(m_instance->instance().loadF32Global(exp.kindIndex)));
                 break;
 
             case Wasm::F64:
-                exportedValue = JSValue(m_instance->instance().loadF64Global(exp.kindIndex));
+                exportedValue = jsNumber(purifyNaN(m_instance->instance().loadF64Global(exp.kindIndex)));
                 break;