Changeset 223002 in webkit for trunk/Source/JavaScriptCore/debugger

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/debugger/Debugger.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/debugger/Debugger.cpp

@@ -1 +1 @@
 /*
- *  Copyright (C) 2008-2017 Apple Inc. All rights reserved.
+ *  Copyright (C) 2008, 2013, 2014, 2016 Apple Inc. All rights reserved.
  *  Copyright (C) 1999-2001 Harri Porten ([email protected])
  *  Copyright (C) 2001 Peter Kelly ([email protected])
@@ -653 +653 @@
         return;
 
-    EntryFrame* topEntryFrame = m_vm.topEntryFrame;
-    m_pauseOnCallFrame = m_currentCallFrame ? m_currentCallFrame->callerFrame(topEntryFrame) : nullptr;
+    VMEntryFrame* topVMEntryFrame = m_vm.topVMEntryFrame;
+    m_pauseOnCallFrame = m_currentCallFrame ? m_currentCallFrame->callerFrame(topVMEntryFrame) : nullptr;
     m_pauseOnStepOut = true;
     setSteppingMode(SteppingModeEnabled);
@@ -832 +832 @@
         return;
 
-    EntryFrame* topEntryFrame = m_vm.topEntryFrame;
-    CallFrame* callerFrame = m_currentCallFrame->callerFrame(topEntryFrame);
+    VMEntryFrame* topVMEntryFrame = m_vm.topVMEntryFrame;
+    CallFrame* callerFrame = m_currentCallFrame->callerFrame(topVMEntryFrame);
 
     // Returning from a call, there was at least one expression on the statement we are returning to.
@@ -857 +857 @@
         return;
 
-    EntryFrame* topEntryFrame = m_vm.topEntryFrame;
-    CallFrame* callerFrame = m_currentCallFrame->callerFrame(topEntryFrame);
+    VMEntryFrame* topVMEntryFrame = m_vm.topVMEntryFrame;
+    CallFrame* callerFrame = m_currentCallFrame->callerFrame(topVMEntryFrame);
 
     // Treat stepping over an exception location like a step-out.
@@ -887 +887 @@
         return;
 
-    EntryFrame* topEntryFrame = m_vm.topEntryFrame;
-    CallFrame* callerFrame = m_currentCallFrame->callerFrame(topEntryFrame);
+    VMEntryFrame* topVMEntryFrame = m_vm.topVMEntryFrame;
+    CallFrame* callerFrame = m_currentCallFrame->callerFrame(topVMEntryFrame);
 
     // Returning from a program, could be eval(), there was at least one expression on the statement we are returning to.