diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-07 14:05:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-07 14:05:16 +0100 |
| commit | 689406ac2424095d6cd4e6bcb3430e53a7e7bbfa (patch) | |
| tree | 00442a814126e57c6a36f740669416b79f3dcf13 /src/script/api/qscriptcontextinfo.cpp | |
| parent | fbe7ad18c35aa662693836a65af1e5b67522e1bf (diff) | |
| parent | 8ca2081418ad301effb8f08e7a59080c262c0362 (diff) | |
| download | qtscript-689406ac2424095d6cd4e6bcb3430e53a7e7bbfa.tar.gz | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/script/api/qscriptcontextinfo.cpp')
| -rw-r--r-- | src/script/api/qscriptcontextinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptcontextinfo.cpp b/src/script/api/qscriptcontextinfo.cpp index b838f15..15f0966 100644 --- a/src/script/api/qscriptcontextinfo.cpp +++ b/src/script/api/qscriptcontextinfo.cpp @@ -159,7 +159,7 @@ QScriptContextInfoPrivate::QScriptContextInfoPrivate(const QScriptContext *conte if (returnPC && codeBlock && QScriptEnginePrivate::hasValidCodeBlockRegister(frame)) { #if ENABLE(JIT) JSC::JITCode code = codeBlock->getJITCode(); - unsigned jitOffset = code.offsetOf(JSC::ReturnAddressPtr(returnPC).value()); + uintptr_t jitOffset = reinterpret_cast<uintptr_t>(JSC::ReturnAddressPtr(returnPC).value()) - reinterpret_cast<uintptr_t>(code.addressForCall().executableAddress()); // We can only use the JIT code offset if it's smaller than the JIT size; // otherwise calling getBytecodeIndex() is meaningless. if (jitOffset < code.size()) { |