Title: [206401] trunk/Source/_javascript_Core
- Revision
- 206401
- Author
- [email protected]
- Date
- 2016-09-26 16:11:53 -0700 (Mon, 26 Sep 2016)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (206400 => 206401)
--- trunk/Source/_javascript_Core/ChangeLog 2016-09-26 22:48:18 UTC (rev 206400)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-09-26 23:11:53 UTC (rev 206401)
@@ -1,3 +1,18 @@
+2016-09-26 Mark Lam <[email protected]>
+
+ 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 <[email protected]>
Add an Option to disable the CodeCache
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (206400 => 206401)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2016-09-26 22:48:18 UTC (rev 206400)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2016-09-26 23:11:53 UTC (rev 206401)
@@ -678,7 +678,7 @@
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) {
if (callFrame->callerFrameOrVMEntryFrame() == vm.topVMEntryFrame)
Modified: trunk/Source/_javascript_Core/jit/JITExceptions.cpp (206400 => 206401)
--- trunk/Source/_javascript_Core/jit/JITExceptions.cpp 2016-09-26 22:48:18 UTC (rev 206400)
+++ trunk/Source/_javascript_Core/jit/JITExceptions.cpp 2016-09-26 23:11:53 UTC (rev 206401)
@@ -42,7 +42,7 @@
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();
if (codeBlock)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
