Changeset 156242 in webkit for trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

Timestamp:

Sep 21, 2013, 10:00:45 PM (12 years ago)

Author:

[email protected]

Message:

Interpreter::unwind() has no need for the bytecodeOffset
​https://bugs.webkit.org/show_bug.cgi?id=121755

Reviewed by Oliver Hunt.

It was only using the bytecodeOffset for some debugger stuff, but the debugger could
just get the bytecodeOffset the same way the rest of the machinery does: by using the
CallFrame's location.

It turns out that a lot of really ugly code was in place just to supply this
bytecodeOffset. This patch kills most of that code, and allows us to kill even more
code in a future patch - though most likely that killage will involve further
refactorings as well, see ​https://bugs.webkit.org/show_bug.cgi?id=121734.

• dfg/DFGOperations.cpp:
• interpreter/CallFrame.cpp:

(JSC::CallFrame::bytecodeOffset):
(JSC::CallFrame::codeOrigin):

• interpreter/CallFrame.h:
• interpreter/Interpreter.cpp:

(JSC::Interpreter::unwind):

• interpreter/Interpreter.h:
• jit/JITExceptions.cpp:

(JSC::genericUnwind):

• jit/JITExceptions.h:
• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):
(JSC::cti_vm_handle_exception):

• llint/LLIntExceptions.cpp:

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

• llint/LLIntExceptions.h:
• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

• runtime/CommonSlowPaths.cpp:

(JSC::SLOW_PATH_DECL):

• runtime/CommonSlowPathsExceptions.cpp:

(JSC::CommonSlowPaths::interpreterThrowInCaller):

• runtime/CommonSlowPathsExceptions.h:

File:

• trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -1907 +1907 @@
 DFGHandlerEncoded DFG_OPERATION lookupExceptionHandler(ExecState* exec, uint32_t callIndex)
 {
+    // FIXME: This isn't needed anymore.
+    // https://bugs.webkit.org/show_bug.cgi?id=121734
+    UNUSED_PARAM(callIndex);
+    
     VM* vm = &exec->vm();
     NativeCallFrameTracer tracer(vm, exec);
@@ -1913 +1917 @@
     ASSERT(exceptionValue);
     
-    unsigned vPCIndex = exec->codeBlock()->bytecodeOffsetForCallAtIndex(callIndex);
-    ExceptionHandler handler = genericUnwind(vm, exec, exceptionValue, vPCIndex);
+    ExceptionHandler handler = genericUnwind(vm, exec, exceptionValue);
     ASSERT(handler.catchRoutine);
     return dfgHandlerEncoded(handler.callFrame, handler.catchRoutine);
@@ -1921 +1924 @@
 DFGHandlerEncoded DFG_OPERATION lookupExceptionHandlerInStub(ExecState* exec, StructureStubInfo* stubInfo)
 {
+    // FIXME: This isn't needed anymore.
+    // https://bugs.webkit.org/show_bug.cgi?id=121734
+    UNUSED_PARAM(stubInfo);
+    
     VM* vm = &exec->vm();
     NativeCallFrameTracer tracer(vm, exec);
@@ -1927 +1934 @@
     ASSERT(exceptionValue);
     
-    CodeOrigin codeOrigin = stubInfo->codeOrigin;
-    while (codeOrigin.inlineCallFrame)
-        codeOrigin = codeOrigin.inlineCallFrame->caller;
-    
-    ExceptionHandler handler = genericUnwind(vm, exec, exceptionValue, codeOrigin.bytecodeIndex);
+    ExceptionHandler handler = genericUnwind(vm, exec, exceptionValue);
     ASSERT(handler.catchRoutine);
     return dfgHandlerEncoded(handler.callFrame, handler.catchRoutine);