Changeset 189417 in webkit for trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

Timestamp:

Sep 4, 2015, 8:10:23 PM (10 years ago)

Author:

[email protected]

Message:

Rollout r189411, r189413: Broke JSC tests.

Not reviewed.

• API/tests/PingPongStackOverflowTest.cpp: Removed.
• API/tests/PingPongStackOverflowTest.h: Removed.
• API/tests/testapi.c:

(main):

• JavaScriptCore.xcodeproj/project.pbxproj:
• interpreter/CallFrame.h:

(JSC::ExecState::operator=):
(JSC::ExecState::callerFrame):
(JSC::ExecState::argIndexForRegister):
(JSC::ExecState::callerFrameOrVMEntryFrame):
(JSC::ExecState::callerFrameAndPC):

• interpreter/Interpreter.cpp:

(JSC::UnwindFunctor::UnwindFunctor):
(JSC::UnwindFunctor::operator()):
(JSC::Interpreter::unwind):

• interpreter/Interpreter.h:

(JSC::NativeCallFrameTracer::NativeCallFrameTracer):
(JSC::Interpreter::sampler):

• jit/CCallHelpers.h:

(JSC::CCallHelpers::jumpToExceptionHandler):

• jit/JITExceptions.cpp:

(JSC::genericUnwind):

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

(JSC::JIT::emit_op_catch):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::emit_op_catch):

• jit/JITOperations.cpp:
• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• runtime/VM.h:

(JSC::VM::exceptionOffset):
(JSC::VM::vmEntryFrameForThrowOffset):
(JSC::VM::topVMEntryFrameOffset):
(JSC::VM::callFrameForThrowOffset):

File:

• trunk/Source/JavaScriptCore/jit/JITExceptions.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

@@ -41 +41 @@
 namespace JSC {
 
-void genericUnwind(VM* vm, ExecState* callFrame, UnwindStart unwindStart)
+void genericUnwind(VM* vm, ExecState* callFrame)
 {
     if (Options::breakOnThrow()) {
@@ -50 +50 @@
     Exception* exception = vm->exception();
     RELEASE_ASSERT(exception);
-    HandlerInfo* handler = vm->interpreter->unwind(*vm, callFrame, exception, unwindStart); // This may update callFrame.
+    VMEntryFrame* vmEntryFrame = vm->topVMEntryFrame;
+    HandlerInfo* handler = vm->interpreter->unwind(vmEntryFrame, callFrame, exception); // This may update vmEntryFrame and callFrame.
 
     void* catchRoutine;
@@ -64 +65 @@
         catchRoutine = LLInt::getCodePtr(handleUncaughtException);
     
+    vm->vmEntryFrameForThrow = vmEntryFrame;
     vm->callFrameForThrow = callFrame;
     vm->targetMachinePCForThrow = catchRoutine;