From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 10 Sep 2012 19:10:20 +0200 Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot --- Source/JavaScriptCore/jit/JITExceptions.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/JavaScriptCore/jit/JITExceptions.cpp') diff --git a/Source/JavaScriptCore/jit/JITExceptions.cpp b/Source/JavaScriptCore/jit/JITExceptions.cpp index 2955fac8d..f6cec24bd 100644 --- a/Source/JavaScriptCore/jit/JITExceptions.cpp +++ b/Source/JavaScriptCore/jit/JITExceptions.cpp @@ -32,7 +32,7 @@ #include "JSGlobalData.h" #include "JSValue.h" -#if ENABLE(JIT) +#if ENABLE(JIT) || ENABLE(LLINT) namespace JSC { @@ -47,10 +47,10 @@ ExceptionHandler genericThrow(JSGlobalData* globalData, ExecState* callFrame, JS void* catchRoutine; Instruction* catchPCForInterpreter = 0; if (handler) { - catchRoutine = handler->nativeCode.executableAddress(); catchPCForInterpreter = &callFrame->codeBlock()->instructions()[handler->target]; + catchRoutine = ExecutableBase::catchRoutineFor(handler, catchPCForInterpreter); } else - catchRoutine = FunctionPtr(ctiOpThrowNotCaught).value(); + catchRoutine = FunctionPtr(LLInt::getCodePtr(ctiOpThrowNotCaught)).value(); globalData->callFrameForThrow = callFrame; globalData->targetMachinePCForThrow = catchRoutine; -- cgit v1.2.1