diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-05 15:50:13 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-06 08:14:11 +0000 |
| commit | 46c845826251e1da269b13219eedff4e16da7bf4 (patch) | |
| tree | 809a0fb89654f1ce9a6c4f2f2f8c7f8c96a945d9 /src | |
| parent | 79544c715412a945359d3fe3ebc3dfc11c58f983 (diff) | |
Fix loading of strings when cross-compiling from 64-bit host to 32-bit
The use of sizeof(Type*) is not allowed when calculating indices into
pointer arrays.
Change-Id: I5531efc80d0267eaceade76ad2b96d454eab9392
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/jit/qv4assembler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jit/qv4assembler.cpp b/src/qml/jit/qv4assembler.cpp index 0d06b421f6..3b9c2904dc 100644 --- a/src/qml/jit/qv4assembler.cpp +++ b/src/qml/jit/qv4assembler.cpp @@ -310,7 +310,7 @@ typename Assembler<TargetConfiguration>::Pointer Assembler<TargetConfiguration>: loadPtr(Address(Assembler::ScratchRegister, targetStructureOffset(Heap::ExecutionContext::baseOffset + offsetof(Heap::ExecutionContextData, compilationUnit))), Assembler::ScratchRegister); loadPtr(Address(Assembler::ScratchRegister, offsetof(CompiledData::CompilationUnitBase, runtimeStrings)), reg); const int id = _jsGenerator->registerString(string); - return Pointer(reg, id * sizeof(QV4::String*)); + return Pointer(reg, id * RegisterSize); } template <typename TargetConfiguration> |