From 933f80f345cb04df6ecafe9c76f262553a5a198c Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 20 Dec 2023 15:47:43 +0100 Subject: QtQml: Move engine-specific data out of base compilation unit We want to re-use the base compilation unit for different engines. To do that, we cannot have data in there that belongs to a specific engine. Pick-to: 6.7 Task-number: QTBUG-120189 Change-Id: I8e43e7ec6c1cd33249dc4ed15fec16babc6d06fb Reviewed-by: Fabian Kosmale --- src/qml/jit/qv4baselineassembler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/jit/qv4baselineassembler.cpp') diff --git a/src/qml/jit/qv4baselineassembler.cpp b/src/qml/jit/qv4baselineassembler.cpp index 156266a234..496624c752 100644 --- a/src/qml/jit/qv4baselineassembler.cpp +++ b/src/qml/jit/qv4baselineassembler.cpp @@ -903,7 +903,7 @@ void BaselineAssembler::storeHeapObject(int reg) void BaselineAssembler::loadImport(int index) { Address addr = pasm()->loadCompilationUnitPtr(PlatformAssembler::ScratchRegister); - addr.offset = offsetof(QV4::CompiledData::CompilationUnitBase, imports); + addr.offset = offsetof(QV4::CompilationUnitRuntimeData, imports); pasm()->loadPtr(addr, PlatformAssembler::ScratchRegister); addr.offset = index * int(sizeof(QV4::Value*)); pasm()->loadPtr(addr, PlatformAssembler::ScratchRegister); -- cgit v1.2.3