Changeset 223002 in webkit for trunk/Source/JavaScriptCore/runtime/VM.h

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/runtime/VM.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/VM.h

@@ -56 +56 @@
 #include "VMEntryRecord.h"
 #include "VMTraps.h"
-#include "WasmContext.h"
 #include "Watchpoint.h"
 #include <wtf/BumpPointerAllocator.h>
@@ -331 +330 @@
     VMType vmType;
     ClientData* clientData;
-    EntryFrame* topEntryFrame;
+    VMEntryFrame* topVMEntryFrame;
     // NOTE: When throwing an exception while rolling back the call frame, this may be equal to
-    // topEntryFrame.
+    // topVMEntryFrame.
     // FIXME: This should be a void*, because it might not point to a CallFrame.
     // https://bugs.webkit.org/show_bug.cgi?id=160441
     ExecState* topCallFrame { nullptr };
-#if ENABLE(WEBASSEMBLY)
-    Wasm::Context wasmContext;
-#endif
+    // FIXME: Save this state elsewhere to allow PIC. https://bugs.webkit.org/show_bug.cgi?id=169773
+    JSWebAssemblyInstance* wasmContext { nullptr };
     Strong<Structure> structureStructure;
     Strong<Structure> structureRareDataStructure;
@@ -504 +502 @@
     }
 
-    static ptrdiff_t topEntryFrameOffset()
-    {
-        return OBJECT_OFFSETOF(VM, topEntryFrame);
+    static ptrdiff_t topVMEntryFrameOffset()
+    {
+        return OBJECT_OFFSETOF(VM, topVMEntryFrame);
     }