diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-10 00:15:48 (GMT) |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-10 00:15:48 (GMT) |
| commit | 9e43002b7d7319c143c97b707e095fef434d0af2 (patch) | |
| tree | a9601fb969dfef5a05c8ce70e85030ae1e3cacbb /src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp | |
| parent | c5be02430eda5a555114ef332a389b7621904b17 (diff) | |
| parent | 9fe43c999d3d9b21836345522bb67bab38e661af (diff) | |
| download | Qt-9e43002b7d7319c143c97b707e095fef434d0af2.zip Qt-9e43002b7d7319c143c97b707e095fef434d0af2.tar.gz Qt-9e43002b7d7319c143c97b707e095fef434d0af2.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp index 3af4a29..c538eb1 100644 --- a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp @@ -586,13 +586,14 @@ NEVER_INLINE HandlerInfo* Interpreter::throwException(CallFrame*& callFrame, JSV unsigned bytecodeOffsetTemp = bytecodeOffset; CodeBlock *codeBlockTemp = codeBlock; while (!(handler = codeBlockTemp->handlerForBytecodeOffset(bytecodeOffsetTemp))) { + void* returnPC = callFrameTemp->returnPC(); callFrameTemp = callFrameTemp->callerFrame(); if (callFrameTemp->hasHostCallFrameFlag()) { hasHandler = false; break; } else { codeBlockTemp = callFrameTemp->codeBlock(); - bytecodeOffsetTemp = bytecodeOffsetForPC(callFrameTemp, codeBlockTemp, callFrameTemp->returnPC()); + bytecodeOffsetTemp = bytecodeOffsetForPC(callFrameTemp, codeBlockTemp, returnPC); } } if (debugger) |