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

Timestamp:

Sep 10, 2013, 2:00:42 PM (12 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: [JSC] Caught exception is treated as uncaught
​https://bugs.webkit.org/show_bug.cgi?id=93607

Reviewed by Geoff Garen.

Source/JavaScriptCore:

Check up the entire call stack to see if there is an exception handler.

• interpreter/Interpreter.cpp:

(JSC::GetExceptionHandlerFunctor::GetExceptionHandlerFunctor):
(JSC::GetExceptionHandlerFunctor::handler):
(JSC::GetExceptionHandlerFunctor::operator()):

LayoutTests:

Add tests for different inspector pause on exceptions states.

• inspector-protocol/debugger/resources/exception.js: Added.
• inspector-protocol/debugger/setPauseOnExceptions-all-expected.txt: Added.
• inspector-protocol/debugger/setPauseOnExceptions-all.html: Added.
• inspector-protocol/debugger/setPauseOnExceptions-none-expected.txt: Added.
• inspector-protocol/debugger/setPauseOnExceptions-none.html: Added.
• inspector-protocol/debugger/setPauseOnExceptions-uncaught-expected.txt: Added.
• inspector-protocol/debugger/setPauseOnExceptions-uncaught.html: Added.

File:

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

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -567 +567 @@
 }
 
+class GetExceptionHandlerFunctor {
+public:
+    GetExceptionHandlerFunctor()
+        : m_handler(0)
+    {
+    }
+
+    HandlerInfo* handler() { return m_handler; }
+
+    StackVisitor::Status operator()(StackVisitor& visitor)
+    {
+        CodeBlock* codeBlock = visitor->codeBlock();
+        if (!codeBlock)
+            return StackVisitor::Continue;
+
+        unsigned bytecodeOffset = visitor->bytecodeOffset();
+        m_handler = codeBlock->handlerForBytecodeOffset(bytecodeOffset);
+        if (m_handler)
+            return StackVisitor::Done;
+
+        return StackVisitor::Continue;
+    }
+
+private:
+    HandlerInfo* m_handler;
+};
+
 class UnwindFunctor {
 public:
@@ -628 +655 @@
         // Afterwards, the values are put back to continue processing this error.
         ClearExceptionScope scope(&callFrame->vm());
-        
         DebuggerCallFrame debuggerCallFrame(callFrame, exceptionValue);
-        bool hasHandler = codeBlock->handlerForBytecodeOffset(bytecodeOffset);
+
+        bool hasHandler;
+        if (isTermination)
+            hasHandler = false;
+        else {
+            GetExceptionHandlerFunctor functor;
+            callFrame->iterate(functor);
+            hasHandler = !!functor.handler();
+        }
+
         debugger->exception(debuggerCallFrame, codeBlock->ownerExecutable()->sourceID(), codeBlock->lineNumberForBytecodeOffset(bytecodeOffset), 0, hasHandler);
     }