From e52247f16e608134d1ff663774f930a00a431eb5 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 26 May 2009 16:56:18 +1000
Subject: Remove AssignValueSource instruction

---
 src/declarative/qml/qmlcompiler.cpp    | 18 +++++-------------
 src/declarative/qml/qmlinstruction.cpp |  3 ---
 src/declarative/qml/qmlinstruction_p.h |  1 -
 src/declarative/qml/qmlvme.cpp         | 26 --------------------------
 4 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 1022028..0712136 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -1188,19 +1188,11 @@ bool QmlCompiler::compilePropertyObjectAssignment(QmlParser::Property *prop,
         } else if (isPropertyValue) {
             COMPILE_CHECK(compileObject(v->object, ctxt));
 
-            if (prop->index != -1) {
-                QmlInstruction assign;
-                assign.type = QmlInstruction::StoreValueSource;
-                assign.line = v->object->location.start.line;
-                assign.assignValueSource.property = prop->index;
-                output->bytecode << assign;
-            } else {
-                QmlInstruction assign;
-                assign.type = QmlInstruction::AssignValueSource;
-                assign.line = v->object->location.start.line;
-                assign.assignValueSource.property = output->indexForByteArray(prop->name);;
-                output->bytecode << assign;
-            }
+            QmlInstruction assign;
+            assign.type = QmlInstruction::StoreValueSource;
+            assign.line = v->object->location.start.line;
+            assign.assignValueSource.property = prop->index;
+            output->bytecode << assign;
 
             v->type = Value::ValueSource;
         } else {
diff --git a/src/declarative/qml/qmlinstruction.cpp b/src/declarative/qml/qmlinstruction.cpp
index 99f6253..5197b7b 100644
--- a/src/declarative/qml/qmlinstruction.cpp
+++ b/src/declarative/qml/qmlinstruction.cpp
@@ -127,9 +127,6 @@ void QmlCompiledComponent::dump(QmlInstruction *instr, int idx)
     case QmlInstruction::AssignSignalObject:
         qWarning() << idx << "\t" << line << "\t" << "ASSIGN_SIGNAL_OBJECT\t" << instr->assignSignalObject.signal << "\t\t\t" << datas.at(instr->assignSignalObject.signal);
         break;
-    case QmlInstruction::AssignValueSource:
-        qWarning() << idx << "\t" << line << "\t" << "ASSIGN_VALUE_SOURCE\t" << instr->assignValueSource.property << "\t\t\t" << datas.at(instr->assignValueSource.property);
-        break;
     case QmlInstruction::StoreBinding:
         qWarning() << idx << "\t" << line << "\t" << "STORE_BINDING\t\t" << instr->assignBinding.property << "\t" << instr->assignBinding.value << "\t\t" << instr->assignBinding.context << primitives.at(instr->assignBinding.value);
         break;
diff --git a/src/declarative/qml/qmlinstruction_p.h b/src/declarative/qml/qmlinstruction_p.h
index 190cab5..cd66d66 100644
--- a/src/declarative/qml/qmlinstruction_p.h
+++ b/src/declarative/qml/qmlinstruction_p.h
@@ -113,7 +113,6 @@ public:
         AssignSignalObject,       /* assignSignalObject */
         AssignCustomType,          /* assignCustomType */
 
-        AssignValueSource,        /* assignValueSource */
         StoreBinding,             /* assignBinding */
         StoreCompiledBinding,     /* assignBinding */
         StoreValueSource,         /* assignValueSource */
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index e9649c5..6d46422 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -88,7 +88,6 @@ Q_DECLARE_PERFORMANCE_LOG(QFxCompiler) {
     Q_DECLARE_PERFORMANCE_METRIC(InstrStoreSignal);
     Q_DECLARE_PERFORMANCE_METRIC(InstrStoreObjectQmlList);
     Q_DECLARE_PERFORMANCE_METRIC(InstrAssignSignalObject);
-    Q_DECLARE_PERFORMANCE_METRIC(InstrAssignValueSource);
     Q_DECLARE_PERFORMANCE_METRIC(InstrStoreBinding);
     Q_DECLARE_PERFORMANCE_METRIC(InstrStoreCompiledBinding);
     Q_DECLARE_PERFORMANCE_METRIC(InstrStoreValueSource);
@@ -131,7 +130,6 @@ Q_DEFINE_PERFORMANCE_LOG(QFxCompiler, "QFxCompiler") {
     Q_DEFINE_PERFORMANCE_METRIC(InstrStoreSignal, "StoreSignal");
     Q_DEFINE_PERFORMANCE_METRIC(InstrStoreObjectQmlList, "StoreObjectQmlList");
     Q_DEFINE_PERFORMANCE_METRIC(InstrAssignSignalObject, "AssignSignalObject");
-    Q_DEFINE_PERFORMANCE_METRIC(InstrAssignValueSource, "AssignValueSource");
     Q_DEFINE_PERFORMANCE_METRIC(InstrStoreBinding, "StoreBinding");
     Q_DEFINE_PERFORMANCE_METRIC(InstrStoreCompiledBinding, "StoreCompiledBinding");
     Q_DEFINE_PERFORMANCE_METRIC(InstrStoreValueSource, "StoreValueSource");
@@ -668,30 +666,6 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
             }
             break;
 
-        case QmlInstruction::AssignValueSource:
-            {
-                QObject *target = stack.at(stack.count() - 2);
-                int propIdx = instr.assignValueSource.property;
-                QByteArray pr;
-                if (propIdx == -1) {
-                    pr = QmlMetaType::defaultProperty(target).name();
-                    if (pr.isEmpty())
-                        VME_EXCEPTION("Unable to resolve default property");
-                } else {
-                    pr = datas.at(propIdx);
-                }
-
-                int coreIdx = qIndexOfProperty(target, pr);
-                if (coreIdx != -1) {
-                    instr.type = QmlInstruction::StoreValueSource;
-                    instr.assignValueSource.property = coreIdx;
-                    ii--;
-                } else {
-                    VME_EXCEPTION("Unknown property" << pr);
-                }
-            }
-            break;
-
         case QmlInstruction::PushProperty:
             {
 #ifdef Q_ENABLE_PERFORMANCE_LOG
-- 
cgit v0.12