diff options
author | Janne Anttila <janne.anttila@digia.com> | 2009-09-02 08:14:33 (GMT) |
---|---|---|
committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-02 08:14:33 (GMT) |
commit | c0358c891d91b7fe78f439eefc706d87099e2634 (patch) | |
tree | dccd4560a111972ed1317b711d028420dded071a /src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp | |
parent | 584129c518719df51bc4812cc30773ab81e3f3cd (diff) | |
parent | 0b5a81dd9aa153f6cd3a3929ee7ed82ca48f45a5 (diff) | |
download | Qt-c0358c891d91b7fe78f439eefc706d87099e2634.zip Qt-c0358c891d91b7fe78f439eefc706d87099e2634.tar.gz Qt-c0358c891d91b7fe78f439eefc706d87099e2634.tar.bz2 |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp b/src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp index 8371229..4a33e67 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/jit/JITOpcodes.cpp @@ -684,6 +684,10 @@ void JIT::emit_op_catch(Instruction* currentInstruction) killLastResultRegister(); // FIXME: Implicitly treat op_catch as a labeled statement, and remove this line of code. peek(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*)); emitPutVirtualRegister(currentInstruction[1].u.operand); +#ifdef QT_BUILD_SCRIPT_LIB + JITStubCall stubCall(this, JITStubs::cti_op_debug_catch); + stubCall.call(); +#endif } void JIT::emit_op_jmp_scopes(Instruction* currentInstruction) |