JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / jit / JITExceptions.cpp

diff --git a/jit/JITExceptions.cpp b/jit/JITExceptions.cpp
index 1375ae6477d49ae689ac5f6546c9cc316cba7217..4f6d9e8f02908ca8bb4bf14495ba52a5f89f3d7b 100644 (file)
--- a/jit/JITExceptions.cpp
+++ b/jit/JITExceptions.cpp
@@ -40,15 +40,17 @@
 
 namespace JSC {
 
 
 namespace JSC {
 

-void genericUnwind(VM* vm, ExecState* callFrame, JSValue exceptionValue)
+void genericUnwind(VM* vm, ExecState* callFrame)

 {
     if (Options::breakOnThrow()) {
         dataLog("In call frame ", RawPointer(callFrame), " for code block ", *callFrame->codeBlock(), "\n");
         CRASH();
     }
     
 {
     if (Options::breakOnThrow()) {
         dataLog("In call frame ", RawPointer(callFrame), " for code block ", *callFrame->codeBlock(), "\n");
         CRASH();
     }
     

-    RELEASE_ASSERT(exceptionValue);
-    HandlerInfo* handler = vm->interpreter->unwind(callFrame, exceptionValue); // This may update callFrame.
+    Exception* exception = vm->exception();
+    RELEASE_ASSERT(exception);
+    VMEntryFrame* vmEntryFrame = vm->topVMEntryFrame;
+    HandlerInfo* handler = vm->interpreter->unwind(vmEntryFrame, callFrame, exception); // This may update vmEntryFrame and callFrame.

 
     void* catchRoutine;
     Instruction* catchPCForInterpreter = 0;
 
     void* catchRoutine;
     Instruction* catchPCForInterpreter = 0;


@@ -62,6 +64,7 @@ void genericUnwind(VM* vm, ExecState* callFrame, JSValue exceptionValue)
     } else
         catchRoutine = LLInt::getCodePtr(handleUncaughtException);
     
     } else
         catchRoutine = LLInt::getCodePtr(handleUncaughtException);
     

+    vm->vmEntryFrameForThrow = vmEntryFrame;

     vm->callFrameForThrow = callFrame;
     vm->targetMachinePCForThrow = catchRoutine;
     vm->targetInterpreterPCForThrow = catchPCForInterpreter;
     vm->callFrameForThrow = callFrame;
     vm->targetMachinePCForThrow = catchRoutine;
     vm->targetInterpreterPCForThrow = catchPCForInterpreter;