diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-09-09 10:01:10 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-09-09 10:01:10 (GMT) |
| commit | 5a242e8a8cd1c23991da3df288c4e91b06532d43 (patch) | |
| tree | df9dfec40adb3d2c3996024584e6d54571d63f1c /src | |
| parent | 12dbb637d42de5cc47cfff242d923d2dd5fce260 (diff) | |
| parent | 515828f43d1aeee3ad50f6da55a12afce43f1557 (diff) | |
| download | Qt-5a242e8a8cd1c23991da3df288c4e91b06532d43.zip Qt-5a242e8a8cd1c23991da3df288c4e91b06532d43.tar.gz Qt-5a242e8a8cd1c23991da3df288c4e91b06532d43.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
| -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) |