Changeset 261593 in webkit

Timestamp:

May 12, 2020 5:51:21 PM (4 years ago)

Author:

mark.lam@apple.com

Message:

Cherry-pick r261549. rdar://problem/63156073

2020-05-12 Mark Lam <​mark.lam@apple.com>

Wasm::enableFastMemory() was called too late.
​https://bugs.webkit.org/show_bug.cgi?id=211773

Reviewed by Yusuke Suzuki.

Source/JavaScriptCore:

If Wasm fast memory is to be enabled, we should just do it in initializeThreading()
just like for all the other signal handlers that need to be initialized for JSC.
This simplifies its initialization and ensures that it is done in a timely manner
before Configs are frozen.

• jsc.cpp: (jscmain):
• runtime/InitializeThreading.cpp: (JSC::initializeThreading):

Source/WebKit:

Previously, we were calling Wasm::enableFastMemory() in WebProcess::initializeWebProcess().
By then, it is too late because the JSC::Config and WTF::Config have already been
frozen. There is nothing special about Wasm::enableFastMemory() that it needs to
be called this late. This patch moves it into JSC::initializeThreading() where
it belongs.

This change also make the initialization of Wasm fast memory consistent with how
we have always done it for the jsc shell i.e. it is initialized at the end of
JSC::initializeThreading().

• WebProcess/WebProcess.cpp: (WebKit::WebProcess::initializeWebProcess):

Location:

branches/safari-609-branch

Files:

• . (modified) (1 prop)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/jsc.cpp (modified) (3 diffs)
• Source/JavaScriptCore/runtime/InitializeThreading.cpp (modified) (2 diffs)
• Source/WebKit (modified) (1 prop)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebProcess.cpp (modified) (2 diffs)

branches/safari-609-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-05-12  Mark Lam  <mark.lam@apple.com>
+
+        Cherry-pick r261549. rdar://problem/63156073
+
+    2020-05-12  Mark Lam  <mark.lam@apple.com>
+
+            Wasm::enableFastMemory() was called too late.
+            https://bugs.webkit.org/show_bug.cgi?id=211773
+
+            Reviewed by Yusuke Suzuki.
+
+            If Wasm fast memory is to be enabled, we should just do it in initializeThreading()
+            just like for all the other signal handlers that need to be initialized for JSC.
+            This simplifies its initialization and ensures that it is done in a timely manner
+            before Configs are frozen.
+
+            * jsc.cpp:
+            (jscmain):
+            * runtime/InitializeThreading.cpp:
+            (JSC::initializeThreading):
+
 2020-05-12  Mark Lam  <mark.lam@apple.com>
 

branches/safari-609-branch/Source/JavaScriptCore/jsc.cpp

@@ -1 +1 @@
 /*
  *  Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- *  Copyright (C) 2004-2019 Apple Inc. All rights reserved.
+ *  Copyright (C) 2004-2020 Apple Inc. All rights reserved.
  *  Copyright (C) 2006 Bjoern Graf (bjoern.graf@gmail.com)
  *
@@ -75 +75 @@
 #include "WasmCapabilities.h"
 #include "WasmContext.h"
-#include "WasmFaultSignalHandler.h"
 #include "WasmMemory.h"
 #include <locale.h>
@@ -3139 +3138 @@
     JSC::initializeThreading();
     initializeTimeoutIfNeeded();
-#if ENABLE(WEBASSEMBLY)
-    JSC::Wasm::enableFastMemory();
-#endif
 
     bool gigacageDisableRequested = false;

branches/safari-609-branch/Source/JavaScriptCore/runtime/InitializeThreading.cpp

@@ -48 +48 @@
 #include "WasmCalleeRegistry.h"
 #include "WasmCapabilities.h"
+#include "WasmFaultSignalHandler.h"
 #include "WasmThunks.h"
 #include "WriteBarrier.h"
@@ -105 +106 @@
 #endif
         VMTraps::initializeSignals();
+#if ENABLE(WEBASSEMBLY)
+        Wasm::enableFastMemory();
+#endif
 
         WTF::compilerFence();

branches/safari-609-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-12  Mark Lam  <mark.lam@apple.com>
+
+        Cherry-pick r261549. rdar://problem/63156073
+
+    2020-05-12  Mark Lam  <mark.lam@apple.com>
+
+            Wasm::enableFastMemory() was called too late.
+            https://bugs.webkit.org/show_bug.cgi?id=211773
+
+            Reviewed by Yusuke Suzuki.
+
+            Previously, we were calling Wasm::enableFastMemory() in WebProcess::initializeWebProcess().
+            By then, it is too late because the JSC::Config and WTF::Config have already been
+            frozen.  There is nothing special about Wasm::enableFastMemory() that it needs to
+            be called this late.  This patch moves it into JSC::initializeThreading() where
+            it belongs.
+
+            This change also make the initialization of Wasm fast memory consistent with how
+            we have always done it for the jsc shell i.e. it is initialized at the end of
+            JSC::initializeThreading().
+
+            * WebProcess/WebProcess.cpp:
+            (WebKit::WebProcess::initializeWebProcess):
+
 2020-05-12  Alan Coon  <alancoon@apple.com>
 

branches/safari-609-branch/Source/WebKit/WebProcess/WebProcess.cpp

@@ -81 +81 @@
 #include <JavaScriptCore/JSLock.h>
 #include <JavaScriptCore/MemoryStatistics.h>
-#include <JavaScriptCore/WasmFaultSignalHandler.h>
 #include <WebCore/AXObjectCache.h>
 #include <WebCore/ApplicationCacheStorage.h>
@@ -453 +452 @@
 #endif
 
-#if ENABLE(WEBASSEMBLY)
-    JSC::Wasm::enableFastMemory();
-#endif
-
 #if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
     WebResourceLoadObserver::setShouldLogUserInteraction(parameters.shouldLogUserInteraction);