diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-09 10:20:41 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-09 10:20:41 (GMT) |
| commit | 94bdab6ac2b47f4e4301dff83f43e1b68d587a61 (patch) | |
| tree | 34089f7b4b7c532ab0929ddf7d9d9c6ec3c7c284 /src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp | |
| parent | 6fd22a76e8e687cbe9b78b8810a7bedef38c9995 (diff) | |
| parent | 5a242e8a8cd1c23991da3df288c4e91b06532d43 (diff) | |
| download | Qt-94bdab6ac2b47f4e4301dff83f43e1b68d587a61.zip Qt-94bdab6ac2b47f4e4301dff83f43e1b68d587a61.tar.gz Qt-94bdab6ac2b47f4e4301dff83f43e1b68d587a61.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.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) |