Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (189774 => 189775)
--- trunk/Source/_javascript_Core/ChangeLog 2015-09-15 03:00:34 UTC (rev 189774)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-09-15 04:05:10 UTC (rev 189775)
@@ -1,3 +1,32 @@
+2015-09-14 Saam barati <sbar...@apple.com>
+
+ rename callFrameForThrow to callFrameForCatch
+ https://bugs.webkit.org/show_bug.cgi?id=149136
+
+ Reviewed by Michael Saboff.
+
+ We use "callFrameForThrow" to mean the call frame in
+ which we're catching the exception. The field name
+ should accurately represent its purpose by being
+ named "callFrameForCatch".
+
+ * jit/CCallHelpers.h:
+ (JSC::CCallHelpers::jumpToExceptionHandler):
+ * jit/JITExceptions.cpp:
+ (JSC::genericUnwind):
+ * 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::callFrameForCatchOffset):
+ (JSC::VM::targetMachinePCForThrowOffset):
+ (JSC::VM::callFrameForThrowOffset): Deleted.
+
2015-09-14 Basile Clement <basile_clem...@apple.com>
[ES6] Implement tail calls in the LLInt and Baseline JIT
Modified: trunk/Source/_javascript_Core/jit/CCallHelpers.h (189774 => 189775)
--- trunk/Source/_javascript_Core/jit/CCallHelpers.h 2015-09-15 03:00:34 UTC (rev 189774)
+++ trunk/Source/_javascript_Core/jit/CCallHelpers.h 2015-09-15 04:05:10 UTC (rev 189775)
@@ -2078,7 +2078,7 @@
void jumpToExceptionHandler()
{
- // genericUnwind() leaves the handler CallFrame* in vm->callFrameForThrow,
+ // genericUnwind() leaves the handler CallFrame* in vm->callFrameForCatch,
// and the address of the handler in vm->targetMachinePCForThrow.
loadPtr(&vm()->targetMachinePCForThrow, GPRInfo::regT1);
jump(GPRInfo::regT1);
Modified: trunk/Source/_javascript_Core/jit/JITExceptions.cpp (189774 => 189775)
--- trunk/Source/_javascript_Core/jit/JITExceptions.cpp 2015-09-15 03:00:34 UTC (rev 189774)
+++ trunk/Source/_javascript_Core/jit/JITExceptions.cpp 2015-09-15 04:05:10 UTC (rev 189775)
@@ -63,7 +63,7 @@
} else
catchRoutine = LLInt::getCodePtr(handleUncaughtException);
- vm->callFrameForThrow = callFrame;
+ vm->callFrameForCatch = callFrame;
vm->targetMachinePCForThrow = catchRoutine;
vm->targetInterpreterPCForThrow = catchPCForInterpreter;
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes.cpp (189774 => 189775)
--- trunk/Source/_javascript_Core/jit/JITOpcodes.cpp 2015-09-15 03:00:34 UTC (rev 189774)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes.cpp 2015-09-15 04:05:10 UTC (rev 189775)
@@ -500,7 +500,7 @@
restoreCalleeSavesFromVMCalleeSavesBuffer();
move(TrustedImmPtr(m_vm), regT3);
- load64(Address(regT3, VM::callFrameForThrowOffset()), callFrameRegister);
+ load64(Address(regT3, VM::callFrameForCatchOffset()), callFrameRegister);
addPtr(TrustedImm32(stackPointerOffsetFor(codeBlock()) * sizeof(Register)), callFrameRegister, stackPointerRegister);
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp (189774 => 189775)
--- trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2015-09-15 03:00:34 UTC (rev 189774)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2015-09-15 04:05:10 UTC (rev 189775)
@@ -806,7 +806,7 @@
move(TrustedImmPtr(m_vm), regT3);
// operationThrow returns the callFrame for the handler.
- load32(Address(regT3, VM::callFrameForThrowOffset()), callFrameRegister);
+ load32(Address(regT3, VM::callFrameForCatchOffset()), callFrameRegister);
addPtr(TrustedImm32(stackPointerOffsetFor(codeBlock()) * sizeof(Register)), callFrameRegister, stackPointerRegister);
Modified: trunk/Source/_javascript_Core/jit/JITOperations.cpp (189774 => 189775)
--- trunk/Source/_javascript_Core/jit/JITOperations.cpp 2015-09-15 03:00:34 UTC (rev 189774)
+++ trunk/Source/_javascript_Core/jit/JITOperations.cpp 2015-09-15 04:05:10 UTC (rev 189775)
@@ -2009,7 +2009,7 @@
JSValue exceptionValue = JSValue::decode(encodedExceptionValue);
vm->throwException(exec, exceptionValue);
- // Results stored out-of-band in vm.targetMachinePCForThrow & vm.callFrameForThrow
+ // Results stored out-of-band in vm.targetMachinePCForThrow & vm.callFrameForCatch
genericUnwind(vm, exec);
}
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm (189774 => 189775)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2015-09-15 03:00:34 UTC (rev 189774)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2015-09-15 04:05:10 UTC (rev 189775)
@@ -303,7 +303,7 @@
andp MarkedBlockMask, t3
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
restoreCalleeSavesFromVMCalleeSavesBuffer(t3, t0)
- loadp VM::callFrameForThrow[t3], cfr
+ loadp VM::callFrameForCatch[t3], cfr
loadp CallerFrame[cfr], cfr
@@ -1836,7 +1836,7 @@
andp MarkedBlockMask, t3
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
restoreCalleeSavesFromVMCalleeSavesBuffer(t3, t0)
- loadp VM::callFrameForThrow[t3], cfr
+ loadp VM::callFrameForCatch[t3], cfr
restoreStackPointerAfterCall()
loadi VM::targetInterpreterPCForThrow[t3], PC
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm (189774 => 189775)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2015-09-15 03:00:34 UTC (rev 189774)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2015-09-15 04:05:10 UTC (rev 189775)
@@ -275,7 +275,7 @@
andp MarkedBlockMask, t3
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
restoreCalleeSavesFromVMCalleeSavesBuffer(t3, t0)
- loadp VM::callFrameForThrow[t3], cfr
+ loadp VM::callFrameForCatch[t3], cfr
loadp CallerFrame[cfr], cfr
vmEntryRecord(cfr, t2)
@@ -1722,7 +1722,7 @@
andp MarkedBlockMask, t3
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
restoreCalleeSavesFromVMCalleeSavesBuffer(t3, t0)
- loadp VM::callFrameForThrow[t3], cfr
+ loadp VM::callFrameForCatch[t3], cfr
restoreStackPointerAfterCall()
loadp CodeBlock[cfr], PB
Modified: trunk/Source/_javascript_Core/runtime/VM.h (189774 => 189775)
--- trunk/Source/_javascript_Core/runtime/VM.h 2015-09-15 03:00:34 UTC (rev 189774)
+++ trunk/Source/_javascript_Core/runtime/VM.h 2015-09-15 04:05:10 UTC (rev 189775)
@@ -392,9 +392,9 @@
return OBJECT_OFFSETOF(VM, m_exception);
}
- static ptrdiff_t callFrameForThrowOffset()
+ static ptrdiff_t callFrameForCatchOffset()
{
- return OBJECT_OFFSETOF(VM, callFrameForThrow);
+ return OBJECT_OFFSETOF(VM, callFrameForCatch);
}
static ptrdiff_t targetMachinePCForThrowOffset()
@@ -456,7 +456,7 @@
JSValue hostCallReturnValue;
unsigned varargsLength;
ExecState* newCallFrameReturnValue;
- ExecState* callFrameForThrow;
+ ExecState* callFrameForCatch;
void* targetMachinePCForThrow;
Instruction* targetInterpreterPCForThrow;
uint32_t osrExitIndex;
