diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
| commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
| tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/JavaScriptCore/jit/JITExceptions.cpp | |
| parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
| download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz | |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/JavaScriptCore/jit/JITExceptions.cpp')
| -rw-r--r-- | Source/JavaScriptCore/jit/JITExceptions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; |