diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 16:03:19 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 16:06:25 +0100 |
| commit | 82365233831b212a7a230d42ea902d7e5df25e99 (patch) | |
| tree | f445b2dfe827e6d60da40ac2f3df4950c59f8e7c /src/script/api | |
| parent | 19550797aa16ee60fc19fdaf90832b4895612226 (diff) | |
| parent | 3b26f6f6643978c9d041a6267dc88e2a59ced763 (diff) | |
| download | qtscript-82365233831b212a7a230d42ea902d7e5df25e99.tar.gz | |
Merge branch 'release' into stable
Change-Id: If3a1efe3888b872702d75e25d1943ff79d57e9c6
Diffstat (limited to 'src/script/api')
| -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()) { |