Changeset 223002 in webkit for trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp

Timestamp:

Oct 6, 2017, 3:12:41 PM (8 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r222791 and r222873.
​https://bugs.webkit.org/show_bug.cgi?id=178031

Caused crashes with workers/wasm LayoutTests (Requested by
ryanhaddad on #webkit).

Reverted changesets:

"WebAssembly: no VM / JS version of everything but Instance"
​https://bugs.webkit.org/show_bug.cgi?id=177473
​http://trac.webkit.org/changeset/222791

"WebAssembly: address no VM / JS follow-ups"
​https://bugs.webkit.org/show_bug.cgi?id=177887
​http://trac.webkit.org/changeset/222873

Patch by Commit Queue <​[email protected]> on 2017-10-06

File:

• trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp

@@ -583 +583 @@
 #endif
 
-void AssemblyHelpers::restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(EntryFrame*& topEntryFrame)
+void AssemblyHelpers::restoreCalleeSavesFromVMEntryFrameCalleeSavesBuffer(VM& vm)
 {
 #if NUMBER_OF_CALLEE_SAVES_REGISTERS > 0
@@ -606 +606 @@
     ASSERT(scratch != InvalidGPRReg);
 
-    loadPtr(&topEntryFrame, scratch);
-    addPtr(TrustedImm32(EntryFrame::calleeSaveRegistersBufferOffset()), scratch);
+    loadPtr(&vm.topVMEntryFrame, scratch);
+    addPtr(TrustedImm32(VMEntryFrame::calleeSaveRegistersBufferOffset()), scratch);
 
     // Restore all callee saves except for the scratch.
@@ -628 +628 @@
     loadPtr(Address(scratch, entry.offset()), scratch);
 #else
-    UNUSED_PARAM(topEntryFrame);
+    UNUSED_PARAM(vm);
 #endif
 }
@@ -779 +779 @@
 
 #if ENABLE(WEBASSEMBLY)
-void AssemblyHelpers::loadWasmContextInstance(GPRReg dst)
+void AssemblyHelpers::loadWasmContext(GPRReg dst)
 {
 #if ENABLE(FAST_TLS_JIT)
-    if (Wasm::Context::useFastTLS()) {
+    if (Wasm::useFastTLSForContext()) {
         loadFromTLSPtr(fastTLSOffsetForKey(WTF_WASM_CONTEXT_KEY), dst);
         return;
     }
 #endif
-    move(Wasm::PinnedRegisterInfo::get().wasmContextInstancePointer, dst);
-}
-
-void AssemblyHelpers::storeWasmContextInstance(GPRReg src)
+    move(Wasm::PinnedRegisterInfo::get().wasmContextPointer, dst);
+}
+
+void AssemblyHelpers::storeWasmContext(GPRReg src)
 {
 #if ENABLE(FAST_TLS_JIT)
-    if (Wasm::Context::useFastTLS()) {
+    if (Wasm::useFastTLSForContext()) {
         storeToTLSPtr(src, fastTLSOffsetForKey(WTF_WASM_CONTEXT_KEY));
         return;
     }
 #endif
-    move(src, Wasm::PinnedRegisterInfo::get().wasmContextInstancePointer);
-}
-
-bool AssemblyHelpers::loadWasmContextInstanceNeedsMacroScratchRegister()
+    move(src, Wasm::PinnedRegisterInfo::get().wasmContextPointer);
+}
+
+bool AssemblyHelpers::loadWasmContextNeedsMacroScratchRegister()
 {
 #if ENABLE(FAST_TLS_JIT)
-    if (Wasm::Context::useFastTLS())
+    if (Wasm::useFastTLSForContext())
         return loadFromTLSPtrNeedsMacroScratchRegister();
 #endif
@@ -810 +810 @@
 }
 
-bool AssemblyHelpers::storeWasmContextInstanceNeedsMacroScratchRegister()
+bool AssemblyHelpers::storeWasmContextNeedsMacroScratchRegister()
 {
 #if ENABLE(FAST_TLS_JIT)
-    if (Wasm::Context::useFastTLS())
+    if (Wasm::useFastTLSForContext())
         return storeToTLSPtrNeedsMacroScratchRegister();
 #endif
@@ -876 +876 @@
 }
 
-void AssemblyHelpers::copyCalleeSavesToEntryFrameCalleeSavesBufferImpl(GPRReg calleeSavesBuffer)
+void AssemblyHelpers::copyCalleeSavesToVMEntryFrameCalleeSavesBufferImpl(GPRReg calleeSavesBuffer)
 {
 #if NUMBER_OF_CALLEE_SAVES_REGISTERS > 0
-    addPtr(TrustedImm32(EntryFrame::calleeSaveRegistersBufferOffset()), calleeSavesBuffer);
+    addPtr(TrustedImm32(VMEntryFrame::calleeSaveRegistersBufferOffset()), calleeSavesBuffer);
 
     RegisterAtOffsetList* allCalleeSaves = VM::getAllCalleeSaveRegisterOffsets();