Changeset 156818 in webkit for trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

Timestamp:

Oct 2, 2013, 7:44:18 PM (12 years ago)

Author:

[email protected]

Message:

Make LLINT exception stack unwinding consistent with the JIT.
​https://bugs.webkit.org/show_bug.cgi?id=122255.

Reviewed by Filip Pizlo.

Previously, the CommonSlowPaths code is expected to behave in an
inconsistent way in terms of whether to unwind the stack when handling
exceptions or not. For the LLINT, the slow path should unwind the stack
before returning. For the JIT, the slow path should not unwind the stack.
This can result in the stack being unwound twice when the exception
being handled is a TerminationException.

This patch fixes the LLINT's expectation so that it expects the same
slow path behavior as the JIT does.

• llint/LLIntExceptions.cpp:

(JSC::LLInt::returnToThrow):
(JSC::LLInt::callToThrow):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

• llint/LLIntSlowPaths.h:
• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• runtime/CommonSlowPathsExceptions.cpp:

(JSC::CommonSlowPaths::interpreterThrowInCaller):

File:

• trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

@@ -38 +38 @@
 #include "Interpreter.h"
 #include "JIT.h"
+#include "JITExceptions.h"
 #include "JSActivation.h"
 #include "JSCJSValue.h"
@@ -1268 +1269 @@
 }
 
+LLINT_SLOW_PATH_DECL(slow_path_handle_exception)
+{
+    LLINT_BEGIN_NO_SET_PC();
+    ASSERT(vm.exception());
+    genericUnwind(&vm, exec, vm.exception());
+    LLINT_END_IMPL();
+}
+
 LLINT_SLOW_PATH_DECL(slow_path_resolve_scope)
 {