diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-05 14:13:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-05 14:13:33 +0100 |
| commit | 8ca2081418ad301effb8f08e7a59080c262c0362 (patch) | |
| tree | 8787dc1fa3b15f1ea0696a9d30cd1fa2fd47813e /src/script/api/qscriptcontextinfo.cpp | |
| parent | 7e1803d382fd199bae12c8e13cd710e51e633a09 (diff) | |
| parent | 82365233831b212a7a230d42ea902d7e5df25e99 (diff) | |
| download | qtscript-8ca2081418ad301effb8f08e7a59080c262c0362.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib100dac4eccddf7a72382b7d1ead7d504a572347
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()) { |