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/llint/LLIntExceptions.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Source/JavaScriptCore/llint/LLIntExceptions.cpp') diff --git a/Source/JavaScriptCore/llint/LLIntExceptions.cpp b/Source/JavaScriptCore/llint/LLIntExceptions.cpp index a915c42e3..80ca732ad 100644 --- a/Source/JavaScriptCore/llint/LLIntExceptions.cpp +++ b/Source/JavaScriptCore/llint/LLIntExceptions.cpp @@ -60,7 +60,8 @@ void interpreterThrowInCaller(ExecState* exec, ReturnAddressPtr pc) Instruction* returnToThrowForThrownException(ExecState* exec) { - return exec->globalData().llintData.exceptionInstructions(); + UNUSED_PARAM(exec); + return LLInt::exceptionInstructions(); } Instruction* returnToThrow(ExecState* exec, Instruction* pc) @@ -73,7 +74,7 @@ Instruction* returnToThrow(ExecState* exec, Instruction* pc) fixupPCforExceptionIfNeeded(exec); genericThrow(globalData, exec, globalData->exception, pc - exec->codeBlock()->instructions().begin()); - return globalData->llintData.exceptionInstructions(); + return LLInt::exceptionInstructions(); } void* callToThrow(ExecState* exec, Instruction* pc) @@ -85,8 +86,8 @@ void* callToThrow(ExecState* exec, Instruction* pc) #endif fixupPCforExceptionIfNeeded(exec); genericThrow(globalData, exec, globalData->exception, pc - exec->codeBlock()->instructions().begin()); - - return bitwise_cast(&llint_throw_during_call_trampoline); + + return LLInt::getCodePtr(llint_throw_during_call_trampoline); } } } // namespace JSC::LLInt -- cgit v1.2.1