Changeset 169221 in webkit for trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

Timestamp:

May 22, 2014, 2:40:21 PM (11 years ago)

Author:

[email protected]

Message:

REGRESSION(r154797): Debugger crashes when stepping over an uncaught exception.
<​https://webkit.org/b/133182>

Reviewed by Oliver Hunt.

Source/JavaScriptCore:
Before r154797, we used to clear the VM exception before calling into the
debugger. After r154797, we don't. This patch will restore this clearing
of the exception before calling into the debugger.

Also added assertions after returning from calls into the debugger to
ensure that the debugger did not introduce any exceptions.

• interpreter/Interpreter.cpp:

(JSC::unwindCallFrame):
(JSC::Interpreter::unwind):
(JSC::Interpreter::debug):

• Fixed the assertion here. Interpreter::debug() should never be called with a pending exception. Debugger callbacks for exceptions should be handled by Interpreter::unwind() and Interpreter::unwindCallFrame().

LayoutTests:

• inspector-protocol/debugger/regress-133182-expected.txt: Added.
• inspector-protocol/debugger/regress-133182.html: Added.

File:

• trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -448 +448 @@
 
     if (Debugger* debugger = callFrame->vmEntryGlobalObject()->debugger()) {
+        ClearExceptionScope scope(&callFrame->vm());
         if (callFrame->callee())
             debugger->returnEvent(callFrame);
         else
             debugger->didExecuteProgram(callFrame);
+        ASSERT(!callFrame->hadException());
     }
 
@@ -701 +703 @@
         exceptionValue = jsNull();
 
-    if (exceptionValue.isObject()) {
+    if (exceptionValue.isObject())
         isTermination = isTerminatedExecutionException(asObject(exceptionValue));
-    }
 
     ASSERT(callFrame->vm().exceptionStack().size());
@@ -727 +728 @@
 
         debugger->exception(callFrame, exceptionValue, hasHandler);
+        ASSERT(!callFrame->hadException());
     }
 
@@ -1226 +1228 @@
     if (!debugger)
         return;
-    ASSERT(callFrame->codeBlock()->hasDebuggerRequests() || callFrame->hadException());
+
+    ASSERT(callFrame->codeBlock()->hasDebuggerRequests());
+    ASSERT(!callFrame->hadException());
 
     switch (debugHookID) {
         case DidEnterCallFrame:
             debugger->callEvent(callFrame);
-            return;
+            break;
         case WillLeaveCallFrame:
             debugger->returnEvent(callFrame);
-            return;
+            break;
         case WillExecuteStatement:
             debugger->atStatement(callFrame);
-            return;
+            break;
         case WillExecuteProgram:
             debugger->willExecuteProgram(callFrame);
-            return;
+            break;
         case DidExecuteProgram:
             debugger->didExecuteProgram(callFrame);
-            return;
+            break;
         case DidReachBreakpoint:
             debugger->didReachBreakpoint(callFrame);
-            return;
-    }
+            break;
+    }
+    ASSERT(!callFrame->hadException());
 }