Changeset 215517 in webkit

Timestamp:

Apr 19, 2017 10:12:37 AM (7 years ago)

Author:

jfbastien@apple.com

Message:

WebAssembly: don't expose any WebAssembly JS object if JIT is off
​https://bugs.webkit.org/show_bug.cgi?id=170782

Reviewed by Saam Barati.

JSTests:

• wasm.yaml:
• wasm/noJIT/noJIT.js: Added.

Source/JavaScriptCore:

It's unexpected that we expose the global WebAssembly object if no
JIT is present because it can't be used to compile or
instantiate. Other APIs such as Memory should also be Inaccessible
in those circumstances.

Also ensure that we don't pre-allocate fast memories if
WebAssembly won't be used, and don't mark our intention to use a
fast TLS slot for WebAssembly.

• runtime/Options.cpp:

(JSC::recomputeDependentOptions):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/wasm.yaml (modified) (2 diffs)
• JSTests/wasm/noJIT (added)
• JSTests/wasm/noJIT/noJIT.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/Options.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2017-04-19  JF Bastien  <jfbastien@apple.com>
+
+        WebAssembly: don't expose any WebAssembly JS object if JIT is off
+        https://bugs.webkit.org/show_bug.cgi?id=170782
+
+        Reviewed by Saam Barati.
+
+        * wasm.yaml:
+        * wasm/noJIT/noJIT.js: Added.
+
 2017-04-18  Mark Lam  <mark.lam@apple.com>
 

trunk/JSTests/wasm.yaml

@@ -1 @@
-# Copyright (C) 2016 Apple Inc. All rights reserved.
+# Copyright (C) 2016-2017 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 - path: wasm/js-api/
   cmd: runWebAssembly unless parseRunCommands
+- path: wasm/noJIT/
+  cmd: runNoJIT unless parseRunCommands
 - path: wasm/function-tests
   cmd: runWebAssembly unless parseRunCommands

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-04-19  JF Bastien  <jfbastien@apple.com>
+
+        WebAssembly: don't expose any WebAssembly JS object if JIT is off
+        https://bugs.webkit.org/show_bug.cgi?id=170782
+
+        Reviewed by Saam Barati.
+
+        It's unexpected that we expose the global WebAssembly object if no
+        JIT is present because it can't be used to compile or
+        instantiate. Other APIs such as Memory should also be Inaccessible
+        in those circumstances.
+
+        Also ensure that we don't pre-allocate fast memories if
+        WebAssembly won't be used, and don't mark our intention to use a
+        fast TLS slot for WebAssembly.
+
+        * runtime/Options.cpp:
+        (JSC::recomputeDependentOptions):
+
 2017-04-19  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/runtime/Options.cpp

@@ -389 +389 @@
         Options::useJIT() = false;
 #endif
+
+    if (!Options::useJIT())
+        Options::useWebAssembly() = false;
+
+    if (!Options::useWebAssembly()) {
+        Options::webAssemblyFastMemoryPreallocateCount() = 0;
+        Options::useWebAssemblyFastTLS() = false;
+    }
+    
     if (Options::dumpDisassembly()
         || Options::dumpDFGDisassembly()