1 files changed, 23 insertions, 25 deletions
diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp
index a999dd4da1..ed57852cd6 100644
--- a/src/qml/compiler/qv4isel_masm.cpp
+++ b/src/qml/compiler/qv4isel_masm.cpp
@@ -439,15 +439,6 @@ static void printDisassembledOutputWithCalls(const char* output, const QHash<voi
 }
 #endif
 
-void Assembler::recordLineNumber(int lineNumber)
-{
-    CodeLineNumerMapping mapping;
-    mapping.location = label();
-    mapping.lineNumber = lineNumber;
-    codeLineNumberMappings << mapping;
-}
-
-
 JSC::MacroAssemblerCodeRef Assembler::link(int *codeSize)
 {
     Label endOfCode = label();
@@ -467,14 +458,6 @@ JSC::MacroAssemblerCodeRef Assembler::link(int *codeSize)
     JSC::JSGlobalData dummy(_executableAllocator);
     JSC::LinkBuffer linkBuffer(dummy, this, 0);
 
-    QVector<uint> lineNumberMapping(codeLineNumberMappings.count() * 2);
-
-    for (int i = 0; i < codeLineNumberMappings.count(); ++i) {
-        lineNumberMapping[i * 2] = linkBuffer.offsetOf(codeLineNumberMappings.at(i).location);
-        lineNumberMapping[i * 2 + 1] = codeLineNumberMappings.at(i).lineNumber;
-    }
-    _isel->jsUnitGenerator()->registerLineNumberMapping(_function, lineNumberMapping);
-
     QHash<void*, const char*> functions;
     foreach (CallToLink ctl, _callsToLink) {
         linkBuffer.link(ctl.call, ctl.externalFunction);
@@ -556,10 +539,11 @@ JSC::MacroAssemblerCodeRef Assembler::link(int *codeSize)
     return codeRef;
 }
 
-InstructionSelection::InstructionSelection(QV4::ExecutableAllocator *execAllocator, V4IR::Module *module, Compiler::JSUnitGenerator *jsGenerator)
+InstructionSelection::InstructionSelection(QQmlEnginePrivate *qmlEngine, QV4::ExecutableAllocator *execAllocator, V4IR::Module *module, Compiler::JSUnitGenerator *jsGenerator)
     : EvalInstructionSelection(execAllocator, module, jsGenerator)
     , _block(0)
     , _as(0)
+    , qmlEngine(qmlEngine)
 {
     compilationUnit = new CompilationUnit;
     compilationUnit->codeRefs.resize(module->functions.size());
@@ -578,7 +562,7 @@ void InstructionSelection::run(int functionIndex)
     qSwap(_function, function);
 
     V4IR::Optimizer opt(_function);
-    opt.run();
+    opt.run(qmlEngine);
 
 #if (CPU(X86_64) && (OS(MAC_OS_X) || OS(LINUX))) || (CPU(X86) && OS(LINUX))
     static const bool withRegisterAllocator = qgetenv("QV4_NO_REGALLOC").isEmpty();
@@ -642,9 +626,9 @@ void InstructionSelection::run(int functionIndex)
 
         foreach (V4IR::Stmt *s, _block->statements) {
             if (s->location.isValid()) {
-                _as->recordLineNumber(s->location.startLine);
                 if (int(s->location.startLine) != lastLine) {
-                    _as->saveInstructionPointer(Assembler::ScratchRegister);
+                    Assembler::Address lineAddr(Assembler::ContextRegister, qOffsetOf(QV4::ExecutionContext, lineNumber));
+                    _as->store32(Assembler::TrustedImm32(s->location.startLine), lineAddr);
                     lastLine = s->location.startLine;
                 }
             }
@@ -896,9 +880,9 @@ void InstructionSelection::loadThisObject(V4IR::Temp *temp)
 #endif
 }
 
-void InstructionSelection::loadQmlIdObject(int id, V4IR::Temp *temp)
+void InstructionSelection::loadQmlIdArray(V4IR::Temp *temp)
 {
-    generateFunctionCall(temp, __qmljs_get_id_object, Assembler::ContextRegister, Assembler::TrustedImm32(id));
+    generateFunctionCall(temp, __qmljs_get_id_array, Assembler::ContextRegister);
 }
 
 void InstructionSelection::loadQmlImportedScripts(V4IR::Temp *temp)
@@ -916,6 +900,11 @@ void InstructionSelection::loadQmlScopeObject(V4IR::Temp *temp)
     generateFunctionCall(temp, __qmljs_get_scope_object, Assembler::ContextRegister);
 }
 
+void InstructionSelection::loadQmlSingleton(const QString &name, V4IR::Temp *temp)
+{
+    generateFunctionCall(temp, __qmljs_get_qml_singleton, Assembler::ContextRegister, Assembler::PointerToString(name));
+}
+
 void InstructionSelection::loadConst(V4IR::Const *sourceConst, V4IR::Temp *targetTemp)
 {
     if (targetTemp->kind == V4IR::Temp::PhysicalRegister) {
@@ -1786,9 +1775,18 @@ void InstructionSelection::constructActivationProperty(V4IR::Name *func, V4IR::E
 
 void InstructionSelection::constructProperty(V4IR::Temp *base, const QString &name, V4IR::ExprList *args, V4IR::Temp *result)
 {
-    prepareCallData(args, 0);
+    prepareCallData(args, base);
+    if (useFastLookups) {
+        uint index = registerGetterLookup(name);
+        generateFunctionCall(result, __qmljs_construct_property_lookup,
+                             Assembler::ContextRegister,
+                             Assembler::TrustedImm32(index),
+                             baseAddressForCallData());
+        return;
+    }
+
     generateFunctionCall(result, __qmljs_construct_property, Assembler::ContextRegister,
-                         Assembler::Reference(base), Assembler::PointerToString(name),
+                         Assembler::PointerToString(name),
                          baseAddressForCallData());
 }