Move valueAsNumber into ExecutableCompilationUnit

This reduces our dependence on QV4::Value in the devtools.

Change-Id: I4b3f937bc08c16f7e2543fdc5cc34c0cfb121f8f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 
 
 
 
 

8 files changed, 21 insertions, 24 deletions

diff --git a/src/qml/compiler/qqmlpropertyvalidator.cpp b/src/qml/compiler/qqmlpropertyvalidator.cpp
index 5b0bd8858a..71d5318652 100644
--- a/src/qml/compiler/qqmlpropertyvalidator.cpp
+++ b/src/qml/compiler/qqmlpropertyvalidator.cpp
@@ -397,7 +397,7 @@ QQmlCompileError QQmlPropertyValidator::validateLiteralBinding(QQmlPropertyCache
     break;
     case QVariant::UInt: {
         if (binding->type == QV4::CompiledData::Binding::Type_Number) {
-            double d = binding->valueAsNumber(compilationUnit->constants);
+            double d = compilationUnit->bindingValueAsNumber(binding);
             if (double(uint(d)) == d)
                 return noError;
         }
@@ -406,7 +406,7 @@ QQmlCompileError QQmlPropertyValidator::validateLiteralBinding(QQmlPropertyCache
     break;
     case QVariant::Int: {
         if (binding->type == QV4::CompiledData::Binding::Type_Number) {
-            double d = binding->valueAsNumber(compilationUnit->constants);
+            double d = compilationUnit->bindingValueAsNumber(binding);
             if (double(int(d)) == d)
                 return noError;
         }
@@ -571,7 +571,7 @@ QQmlCompileError QQmlPropertyValidator::validateLiteralBinding(QQmlPropertyCache
         } else if (property->propType() == qMetaTypeId<QList<int> >()) {
             bool ok = (binding->type == QV4::CompiledData::Binding::Type_Number);
             if (ok) {
-                double n = binding->valueAsNumber(compilationUnit->constants);
+                double n = compilationUnit->bindingValueAsNumber(binding);
                 if (double(int(n)) != n)
                     ok = false;
             }
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index 629adf8231..94b64694ae 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -57,7 +57,6 @@
 #include <QHash>
 #include <QUrl>
 
-#include <private/qv4value_p.h>
 #include <private/qv4executableallocator_p.h>
 #include <private/qqmlrefcount_p.h>
 #include <private/qqmlnullablevalue_p.h>
@@ -522,13 +521,6 @@ struct Q_QML_PRIVATE_EXPORT Binding
     bool isTranslationBinding() const { return type == Type_Translation || type == Type_TranslationById; }
     bool evaluatesToString() const { return type == Type_String || isTranslationBinding(); }
 
-    double valueAsNumber(const Value *constantTable) const
-    {
-        if (type != Type_Number)
-            return 0.0;
-        return constantTable[value.constantValueIndex].doubleValue();
-    }
-
     bool valueAsBoolean() const
     {
         if (type == Type_Boolean)
diff --git a/src/qml/compiler/qv4executablecompilationunit.cpp b/src/qml/compiler/qv4executablecompilationunit.cpp
index 88e5c1dc0e..97c828d4d8 100644
--- a/src/qml/compiler/qv4executablecompilationunit.cpp
+++ b/src/qml/compiler/qv4executablecompilationunit.cpp
@@ -760,7 +760,7 @@ QString ExecutableCompilationUnit::bindingValueAsString(const CompiledData::Bind
     case Binding::Type_Boolean:
         return binding->value.b ? QStringLiteral("true") : QStringLiteral("false");
     case Binding::Type_Number:
-        return QString::number(binding->valueAsNumber(constants));
+        return QString::number(bindingValueAsNumber(binding));
     case Binding::Type_Invalid:
         return QString();
 #if !QT_CONFIG(translation)
diff --git a/src/qml/compiler/qv4executablecompilationunit_p.h b/src/qml/compiler/qv4executablecompilationunit_p.h
index dd3918cc84..4e3aadf28a 100644
--- a/src/qml/compiler/qv4executablecompilationunit_p.h
+++ b/src/qml/compiler/qv4executablecompilationunit_p.h
@@ -244,6 +244,12 @@ public:
 
     QString bindingValueAsString(const CompiledData::Binding *binding) const;
     QString bindingValueAsScriptString(const CompiledData::Binding *binding) const;
+    double bindingValueAsNumber(const CompiledData::Binding *binding) const
+    {
+        if (binding->type != CompiledData::Binding::Type_Number)
+            return 0.0;
+        return constants[binding->value.constantValueIndex].doubleValue();
+    }
 
 protected:
     quint32 totalStringCount() const
diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index e517c6d8b9..5338583164 100644
--- a/src/qml/compiler/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
@@ -51,7 +51,6 @@
 // We mean it.
 //
 #include <private/qv4global_p.h>
-#include <private/qv4value_p.h>
 #include <private/qv4runtime_p.h>
 #include <private/qv4compileddata_p.h> // for CompiledData::CodeOffsetToLine used by the dumper
 #include <qendian.h>
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index 177c0d38bd..e5f376fd34 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -406,7 +406,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const
     switch (propertyType) {
     case QMetaType::QVariant: {
         if (binding->type == QV4::CompiledData::Binding::Type_Number) {
-            double n = binding->valueAsNumber(compilationUnit->constants);
+            double n = compilationUnit->bindingValueAsNumber(binding);
             if (double(int(n)) == n) {
                 if (property->isVarProperty()) {
                     _vmeMetaObject->setVMEProperty(property->coreIndex(), QV4::Value::fromInt32(int(n)));
@@ -481,7 +481,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const
     break;
     case QVariant::UInt: {
         assertType(QV4::CompiledData::Binding::Type_Number);
-        double d = binding->valueAsNumber(compilationUnit->constants);
+        double d = compilationUnit->bindingValueAsNumber(binding);
         uint value = uint(d);
         property->writeProperty(_qobject, &value, propertyWriteFlags);
         break;
@@ -489,7 +489,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const
     break;
     case QVariant::Int: {
         assertType(QV4::CompiledData::Binding::Type_Number);
-        double d = binding->valueAsNumber(compilationUnit->constants);
+        double d = compilationUnit->bindingValueAsNumber(binding);
         int value = int(d);
         property->writeProperty(_qobject, &value, propertyWriteFlags);
         break;
@@ -497,13 +497,13 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const
     break;
     case QMetaType::Float: {
         assertType(QV4::CompiledData::Binding::Type_Number);
-        float value = float(binding->valueAsNumber(compilationUnit->constants));
+        float value = float(compilationUnit->bindingValueAsNumber(binding));
         property->writeProperty(_qobject, &value, propertyWriteFlags);
     }
     break;
     case QVariant::Double: {
         assertType(QV4::CompiledData::Binding::Type_Number);
-        double value = binding->valueAsNumber(compilationUnit->constants);
+        double value = compilationUnit->bindingValueAsNumber(binding);
         property->writeProperty(_qobject, &value, propertyWriteFlags);
     }
     break;
@@ -651,12 +651,12 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const
         if (property->propType() == qMetaTypeId<QList<qreal> >()) {
             assertType(QV4::CompiledData::Binding::Type_Number);
             QList<qreal> value;
-            value.append(binding->valueAsNumber(compilationUnit->constants));
+            value.append(compilationUnit->bindingValueAsNumber(binding));
             property->writeProperty(_qobject, &value, propertyWriteFlags);
             break;
         } else if (property->propType() == qMetaTypeId<QList<int> >()) {
             assertType(QV4::CompiledData::Binding::Type_Number);
-            double n = binding->valueAsNumber(compilationUnit->constants);
+            double n = compilationUnit->bindingValueAsNumber(binding);
             QList<int> value;
             value.append(int(n));
             property->writeProperty(_qobject, &value, propertyWriteFlags);
@@ -687,7 +687,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const
             if (binding->type == QV4::CompiledData::Binding::Type_Boolean) {
                 value = QJSValue(binding->valueAsBoolean());
             } else if (binding->type == QV4::CompiledData::Binding::Type_Number) {
-                double n = binding->valueAsNumber(compilationUnit->constants);
+                double n = compilationUnit->bindingValueAsNumber(binding);
                 if (double(int(n)) == n) {
                     value = QJSValue(int(n));
                 } else
@@ -842,7 +842,7 @@ bool QQmlObjectCreator::setPropertyBinding(const QQmlPropertyData *bindingProper
         ss.d.data()->columnNumber = binding->location.column;
         ss.d.data()->isStringLiteral = binding->type == QV4::CompiledData::Binding::Type_String;
         ss.d.data()->isNumberLiteral = binding->type == QV4::CompiledData::Binding::Type_Number;
-        ss.d.data()->numberValue = binding->valueAsNumber(compilationUnit->constants);
+        ss.d.data()->numberValue = compilationUnit->bindingValueAsNumber(binding);
 
         QQmlPropertyData::WriteFlags propertyWriteFlags = QQmlPropertyData::BypassInterceptor |
                                                             QQmlPropertyData::RemoveBindingOnAliasWrite;
diff --git a/src/qmlmodels/qqmllistmodel.cpp b/src/qmlmodels/qqmllistmodel.cpp
index d1219d958a..c1684d955c 100644
--- a/src/qmlmodels/qqmllistmodel.cpp
+++ b/src/qmlmodels/qqmllistmodel.cpp
@@ -2763,7 +2763,7 @@ bool QQmlListModelParser::applyProperty(
         } else if (binding->evaluatesToString()) {
             value = compilationUnit->bindingValueAsString(binding);
         } else if (binding->type == QV4::CompiledData::Binding::Type_Number) {
-            value = binding->valueAsNumber(compilationUnit->constants);
+            value = compilationUnit->bindingValueAsNumber(binding);
         } else if (binding->type == QV4::CompiledData::Binding::Type_Boolean) {
             value = binding->valueAsBoolean();
         } else if (binding->type == QV4::CompiledData::Binding::Type_Null) {
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index 6aec1219ef..776e7ab59a 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -331,7 +331,7 @@ void QQuickPropertyChangesPrivate::decodeBinding(const QString &propertyPrefix,
         var = compilationUnit->bindingValueAsString(binding);
         break;
     case QV4::CompiledData::Binding::Type_Number:
-        var = binding->valueAsNumber(compilationUnit->constants);
+        var = compilationUnit->bindingValueAsNumber(binding);
         break;
     case QV4::CompiledData::Binding::Type_Boolean:
         var = binding->valueAsBoolean();