1 files changed, 14 insertions, 2 deletions
diff --git a/src/qml/jit/qv4assembler.cpp b/src/qml/jit/qv4assembler.cpp
index 08e4f0a8c0..625f5b5e5a 100644
--- a/src/qml/jit/qv4assembler.cpp
+++ b/src/qml/jit/qv4assembler.cpp
@@ -148,8 +148,7 @@ bool CompilationUnit::memoryMapCode(QString *errorString)
 const Assembler::VoidType Assembler::Void;
 
 Assembler::Assembler(InstructionSelection *isel, IR::Function* function, QV4::ExecutableAllocator *executableAllocator)
-    : _constTable(this)
-    , _function(function)
+    : _function(function)
     , _nextBlock(0)
     , _executableAllocator(executableAllocator)
     , _isel(isel)
@@ -279,6 +278,19 @@ Assembler::Pointer Assembler::loadStringAddress(RegisterID reg, const QString &s
     return Pointer(reg, id * sizeof(QV4::String*));
 }
 
+Assembler::Address Assembler::loadConstant(IR::Const *c, RegisterID baseReg)
+{
+    return loadConstant(convertToValue(c), baseReg);
+}
+
+Assembler::Address Assembler::loadConstant(const Primitive &v, RegisterID baseReg)
+{
+    loadPtr(Address(Assembler::EngineRegister, qOffsetOf(QV4::ExecutionEngine, current)), baseReg);
+    loadPtr(Address(baseReg, qOffsetOf(QV4::Heap::ExecutionContext, constantTable)), baseReg);
+    const int index = _isel->jsUnitGenerator()->registerConstant(v.asReturnedValue());
+    return Address(baseReg, index * sizeof(QV4::Value));
+}
+
 void Assembler::loadStringRef(RegisterID reg, const QString &string)
 {
     const int id = _isel->registerString(string);