Changeset 206401 in webkit

Timestamp:

Sep 26, 2016 4:11:53 PM (8 years ago)

Author:

mark.lam@apple.com

Message:

Exception unwinding code should use a CatchScope instead of a ThrowScope.
​https://bugs.webkit.org/show_bug.cgi?id=162583

Reviewed by Geoffrey Garen.

This is because the exception unwinding code does not throw an exception.
It only inspects the thrown exception and passes it to the appropriate handler.

• interpreter/Interpreter.cpp:

(JSC::Interpreter::unwind):

• jit/JITExceptions.cpp:

(JSC::genericUnwind):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/Interpreter.cpp (modified) (1 diff)
• jit/JITExceptions.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-09-26  Mark Lam  <mark.lam@apple.com>
+
+        Exception unwinding code should use a CatchScope instead of a ThrowScope.
+        https://bugs.webkit.org/show_bug.cgi?id=162583
+
+        Reviewed by Geoffrey Garen.
+
+        This is because the exception unwinding code does not throw an exception.
+        It only inspects the thrown exception and passes it to the appropriate handler.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::unwind):
+        * jit/JITExceptions.cpp:
+        (JSC::genericUnwind):
+
 2016-09-26  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -679 +679 @@
 NEVER_INLINE HandlerInfo* Interpreter::unwind(VM& vm, CallFrame*& callFrame, Exception* exception, UnwindStart unwindStart)
 {
-    auto scope = DECLARE_THROW_SCOPE(vm);
+    auto scope = DECLARE_CATCH_SCOPE(vm);
 
     if (unwindStart == UnwindFromCallerFrame) {

trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

@@ -43 +43 @@
 void genericUnwind(VM* vm, ExecState* callFrame, UnwindStart unwindStart)
 {
-    auto scope = DECLARE_THROW_SCOPE(*vm);
+    auto scope = DECLARE_CATCH_SCOPE(*vm);
     if (Options::breakOnThrow()) {
         CodeBlock* codeBlock = callFrame->codeBlock();