Changeset 223002 in webkit for trunk/Source/JavaScriptCore/interpreter/CallFrame.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/interpreter/CallFrame.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2008-2017 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2013-2014, 2016 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31 +31 @@
 #include "Interpreter.h"
 #include "JSCInlines.h"
-#include "JSWebAssemblyInstance.h"
 #include "VMEntryScope.h"
 #include "WasmContext.h"
@@ -219 +218 @@
     if (!callee().isWasm())
         return lexicalGlobalObject();
-    return vm.wasmContext.load()->globalObject();
+    return Wasm::loadContext(vm)->globalObject();
 #else
     UNUSED_PARAM(vm);
@@ -239 +238 @@
 }
 
-CallFrame* CallFrame::callerFrame(EntryFrame*& currEntryFrame)
-{
-    if (callerFrameOrEntryFrame() == currEntryFrame) {
-        VMEntryRecord* currVMEntryRecord = vmEntryRecord(currEntryFrame);
-        currEntryFrame = currVMEntryRecord->prevTopEntryFrame();
+CallFrame* CallFrame::callerFrame(VMEntryFrame*& currVMEntryFrame)
+{
+    if (callerFrameOrVMEntryFrame() == currVMEntryFrame) {
+        VMEntryRecord* currVMEntryRecord = vmEntryRecord(currVMEntryFrame);
+        currVMEntryFrame = currVMEntryRecord->prevTopVMEntryFrame();
         return currVMEntryRecord->prevTopCallFrame();
     }
-    return static_cast<CallFrame*>(callerFrameOrEntryFrame());
-}
-
-SUPPRESS_ASAN CallFrame* CallFrame::unsafeCallerFrame(EntryFrame*& currEntryFrame)
-{
-    if (unsafeCallerFrameOrEntryFrame() == currEntryFrame) {
-        VMEntryRecord* currVMEntryRecord = vmEntryRecord(currEntryFrame);
-        currEntryFrame = currVMEntryRecord->unsafePrevTopEntryFrame();
+    return static_cast<CallFrame*>(callerFrameOrVMEntryFrame());
+}
+
+SUPPRESS_ASAN CallFrame* CallFrame::unsafeCallerFrame(VMEntryFrame*& currVMEntryFrame)
+{
+    if (unsafeCallerFrameOrVMEntryFrame() == currVMEntryFrame) {
+        VMEntryRecord* currVMEntryRecord = vmEntryRecord(currVMEntryFrame);
+        currVMEntryFrame = currVMEntryRecord->unsafePrevTopVMEntryFrame();
         return currVMEntryRecord->unsafePrevTopCallFrame();
     }
-    return static_cast<CallFrame*>(unsafeCallerFrameOrEntryFrame());
+    return static_cast<CallFrame*>(unsafeCallerFrameOrVMEntryFrame());
 }