VME Method object data cleanup

Get rid of the redundant MethodData meta-data that is stored per-type.

Change-Id: I9faa284bdd0c9f0c9ebb3c66905ab5e34a9ee3a4
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

4 files changed, 11 insertions, 51 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
index ff4e30835d..e08436b7a3 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
@@ -766,9 +766,14 @@ bool QQmlEngineDebugServiceImpl::setMethodBody(int objectId, const QString &meth
     QQmlVMEMetaObject *vmeMetaObject = QQmlVMEMetaObject::get(object);
     Q_ASSERT(vmeMetaObject); // the fact we found the property above should guarentee this
 
-    int lineNumber = vmeMetaObject->vmeMethodLineNumber(prop->coreIndex);
     QV4::ExecutionEngine *v4 = QV8Engine::getV4(qmlEngine(object)->handle());
     QV4::Scope scope(v4);
+
+    int lineNumber = 0;
+    QV4::ScopedFunctionObject oldMethod(scope, vmeMetaObject->vmeMethod(prop->coreIndex));
+    if (oldMethod && oldMethod->d()->function) {
+        lineNumber = oldMethod->d()->function->compiledFunction->location.line;
+    }
     QV4::ScopedValue v(scope, QQmlJavaScriptExpression::evalFunction(contextData, object, jsfunction, contextData->urlString(), lineNumber));
     vmeMetaObject->setVmeMethod(prop->coreIndex, v);
     return true;
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp
index da00496cb2..fcb94a9645 100644
--- a/src/qml/compiler/qqmltypecompiler.cpp
+++ b/src/qml/compiler/qqmltypecompiler.cpp
@@ -660,7 +660,6 @@ bool QQmlPropertyCacheCreator::createMetaObject(int objectIndex, const QmlIR::Ob
 
     QByteArray &dynamicData = vmeMetaObjects[objectIndex] = QByteArray(sizeof(QQmlVMEMetaData)
                                                               + obj->propertyCount() * sizeof(VMD::PropertyData)
-                                                              + obj->functionCount() * sizeof(VMD::MethodData)
                                                               + aliasCount * sizeof(VMD::AliasData), 0);
 
     int effectivePropertyIndex = cache->propertyIndexCacheStart;
@@ -879,24 +878,8 @@ bool QQmlPropertyCacheCreator::createMetaObject(int objectIndex, const QmlIR::Ob
     ((QQmlVMEMetaData *)dynamicData.data())->aliasCount = aliasCount;
 
     // Dynamic slot data - comes after the property data
-    for (const QmlIR::Function *s = obj->firstFunction(); s; s = s->next) {
-        QQmlJS::AST::FunctionDeclaration *astFunction = s->functionDeclaration;
-        int formalsCount = 0;
-        QQmlJS::AST::FormalParameterList *param = astFunction->formals;
-        while (param) {
-            formalsCount++;
-            param = param->next;
-        }
-
-        VMD::MethodData methodData = { /* runtimeFunctionIndex*/ 0, // ###
-                                       formalsCount,
-                                       /* s->location.start.line */0 }; // ###
-
-        VMD *vmd = (QQmlVMEMetaData *)dynamicData.data();
-        VMD::MethodData &md = *(vmd->methodData() + vmd->methodCount);
-        vmd->methodCount++;
-        md = methodData;
-    }
+    VMD *vmd = (QQmlVMEMetaData *)dynamicData.data();
+    vmd->methodCount = obj->functionCount();
 
     return true;
 }
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index 3ded302681..3173e1d09c 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -877,12 +877,11 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void *
                     return -1; // The dynamic method with that id is not available.
                 }
 
-                QQmlVMEMetaData::MethodData *data = metaData->methodData() + id;
-
-                QV4::ScopedCallData callData(scope, data->parameterCount);
+                const unsigned int parameterCount = function->formalParameterCount();
+                QV4::ScopedCallData callData(scope, parameterCount);
                 callData->thisObject = ep->v8engine()->global();
 
-                for (int ii = 0; ii < data->parameterCount; ++ii)
+                for (uint ii = 0; ii < parameterCount; ++ii)
                     callData->args[ii] = scope.engine->fromVariant(*(QVariant *)a[ii + 1]);
 
                 QV4::ScopedValue result(scope);
@@ -1039,22 +1038,6 @@ void QQmlVMEMetaObject::writeProperty(int id, const QVariant &value)
     }
 }
 
-quint16 QQmlVMEMetaObject::vmeMethodLineNumber(int index)
-{
-    if (index < methodOffset()) {
-        Q_ASSERT(parentVMEMetaObject());
-        return parentVMEMetaObject()->vmeMethodLineNumber(index);
-    }
-
-    int plainSignals = metaData->signalCount + metaData->propertyCount + metaData->aliasCount;
-    Q_ASSERT(index >= (methodOffset() + plainSignals) && index < (methodOffset() + plainSignals + metaData->methodCount));
-
-    int rawIndex = index - methodOffset() - plainSignals;
-
-    QQmlVMEMetaData::MethodData *data = metaData->methodData() + rawIndex;
-    return data->lineNumber;
-}
-
 QV4::ReturnedValue QQmlVMEMetaObject::vmeMethod(int index)
 {
     if (index < methodOffset()) {
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h
index fcdac3cc53..20b8b99522 100644
--- a/src/qml/qml/qqmlvmemetaobject_p.h
+++ b/src/qml/qml/qqmlvmemetaobject_p.h
@@ -121,12 +121,6 @@ struct QQmlVMEMetaData
         int propertyType;
     };
 
-    struct MethodData {
-        int runtimeFunctionIndex;
-        int parameterCount;
-        quint16 lineNumber;
-    };
-
     PropertyData *propertyData() const {
         return (PropertyData *)(((char *)const_cast<QQmlVMEMetaData *>(this)) + sizeof(QQmlVMEMetaData));
     }
@@ -134,10 +128,6 @@ struct QQmlVMEMetaData
     AliasData *aliasData() const {
         return (AliasData *)(propertyData() + propertyCount);
     }
-
-    MethodData *methodData() const {
-        return (MethodData *)(aliasData() + aliasCount);
-    }
 };
 
 class QQmlVMEMetaObject;
@@ -204,7 +194,6 @@ public:
 
     bool aliasTarget(int index, QObject **target, int *coreIndex, int *valueTypeIndex) const;
     QV4::ReturnedValue vmeMethod(int index);
-    quint16 vmeMethodLineNumber(int index);
     void setVmeMethod(int index, const QV4::Value &function);
     QV4::ReturnedValue vmeProperty(int index);
     void setVMEProperty(int index, const QV4::Value &v);