From 4b27062f5fae891850fd0f048f2a2421ca9b6c7c Mon Sep 17 00:00:00 2001
From: Kimmo Ollila <kimmo.ollila@qt.io>
Date: Wed, 25 Apr 2018 13:25:45 +0300
Subject: Fix JIT build on INTEGRITY ARM64

-typedef "Jump" may not be used in an elaborated type specifier
-explicit specialization of function must precede its first use
-"Value" is ambiguous

Change-Id: Ic15c196f1b33211cd3f2f25a54ba478747336fe4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Nikola Velinov <nvelinov@ghs.com>
---
 .../masm/assembler/AbstractMacroAssembler.h        |   6 +
 src/3rdparty/masm/assembler/MacroAssemblerARM64.h  | 203 ++++++++++++---------
 src/qml/jsapi/qjsvalue.cpp                         |   8 +-
 src/qml/jsruntime/qv4qobjectwrapper.cpp            |  10 +-
 src/qml/jsruntime/qv4stringobject.cpp              |   4 +-
 src/qml/jsruntime/qv4vme_moth.cpp                  |  74 ++++----
 6 files changed, 173 insertions(+), 132 deletions(-)

(limited to 'src')

diff --git a/src/3rdparty/masm/assembler/AbstractMacroAssembler.h b/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
index 6fac27fdf1..1076384900 100644
--- a/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
+++ b/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
@@ -327,7 +327,13 @@ public:
         template<class TemplateAssemblerType>
         friend class AbstractMacroAssembler;
         friend struct DFG::OSRExit;
+
+#if CPU(ARM_THUMB2) || CPU(ARM64) || defined(V4_BOOTSTRAP)
+        using Jump = typename AssemblerType::template Jump<Label>;
+        friend Jump;
+#else
         friend class Jump;
+#endif
         friend class JumpReplacementWatchpoint;
         friend class MacroAssemblerCodeRef;
         template <typename, template <typename> class> friend class LinkBufferBase;
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerARM64.h b/src/3rdparty/masm/assembler/MacroAssemblerARM64.h
index 1f94eb9032..ba0d7e93f8 100644
--- a/src/3rdparty/masm/assembler/MacroAssemblerARM64.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerARM64.h
@@ -3101,40 +3101,22 @@ private:
     }
 
     template<int datasize>
-    ALWAYS_INLINE void loadUnsignedImmediate(RegisterID rt, RegisterID rn, unsigned pimm)
-    {
-        m_assembler.ldr<datasize>(rt, rn, pimm);
-    }
+    void loadUnsignedImmediate(RegisterID rt, RegisterID rn, unsigned pimm);
 
     template<int datasize>
-    ALWAYS_INLINE void loadUnscaledImmediate(RegisterID rt, RegisterID rn, int simm)
-    {
-        m_assembler.ldur<datasize>(rt, rn, simm);
-    }
+    void loadUnscaledImmediate(RegisterID rt, RegisterID rn, int simm);
 
     template<int datasize>
-    ALWAYS_INLINE void loadSignedAddressedByUnsignedImmediate(RegisterID rt, RegisterID rn, unsigned pimm)
-    {
-        loadUnsignedImmediate<datasize>(rt, rn, pimm);
-    }
+    void loadSignedAddressedByUnsignedImmediate(RegisterID rt, RegisterID rn, unsigned pimm);
 
     template<int datasize>
-    ALWAYS_INLINE void loadSignedAddressedByUnscaledImmediate(RegisterID rt, RegisterID rn, int simm)
-    {
-        loadUnscaledImmediate<datasize>(rt, rn, simm);
-    }
+    void loadSignedAddressedByUnscaledImmediate(RegisterID rt, RegisterID rn, int simm);
 
     template<int datasize>
-    ALWAYS_INLINE void storeUnsignedImmediate(RegisterID rt, RegisterID rn, unsigned pimm)
-    {
-        m_assembler.str<datasize>(rt, rn, pimm);
-    }
+    void storeUnsignedImmediate(RegisterID rt, RegisterID rn, unsigned pimm);
 
     template<int datasize>
-    ALWAYS_INLINE void storeUnscaledImmediate(RegisterID rt, RegisterID rn, int simm)
-    {
-        m_assembler.stur<datasize>(rt, rn, simm);
-    }
+    void storeUnscaledImmediate(RegisterID rt, RegisterID rn, int simm);
 
     void moveWithFixedWidth(TrustedImm32 imm, RegisterID dest)
     {
@@ -3299,74 +3281,19 @@ private:
     }
 
     template<int datasize>
-    ALWAYS_INLINE bool tryLoadWithOffset(RegisterID rt, RegisterID rn, int32_t offset)
-    {
-        if (ARM64Assembler::canEncodeSImmOffset(offset)) {
-            loadUnscaledImmediate<datasize>(rt, rn, offset);
-            return true;
-        }
-        if (ARM64Assembler::canEncodePImmOffset<datasize>(offset)) {
-            loadUnsignedImmediate<datasize>(rt, rn, static_cast<unsigned>(offset));
-            return true;
-        }
-        return false;
-    }
+    bool tryLoadWithOffset(RegisterID rt, RegisterID rn, int32_t offset);
 
     template<int datasize>
-    ALWAYS_INLINE bool tryLoadSignedWithOffset(RegisterID rt, RegisterID rn, int32_t offset)
-    {
-        if (ARM64Assembler::canEncodeSImmOffset(offset)) {
-            loadSignedAddressedByUnscaledImmediate<datasize>(rt, rn, offset);
-            return true;
-        }
-        if (ARM64Assembler::canEncodePImmOffset<datasize>(offset)) {
-            loadSignedAddressedByUnsignedImmediate<datasize>(rt, rn, static_cast<unsigned>(offset));
-            return true;
-        }
-        return false;
-    }
+    bool tryLoadSignedWithOffset(RegisterID rt, RegisterID rn, int32_t offset);
 
     template<int datasize>
-    ALWAYS_INLINE bool tryLoadWithOffset(FPRegisterID rt, RegisterID rn, int32_t offset)
-    {
-        if (ARM64Assembler::canEncodeSImmOffset(offset)) {
-            m_assembler.ldur<datasize>(rt, rn, offset);
-            return true;
-        }
-        if (ARM64Assembler::canEncodePImmOffset<datasize>(offset)) {
-            m_assembler.ldr<datasize>(rt, rn, static_cast<unsigned>(offset));
-            return true;
-        }
-        return false;
-    }
+    bool tryLoadWithOffset(FPRegisterID rt, RegisterID rn, int32_t offset);
 
     template<int datasize>
-    ALWAYS_INLINE bool tryStoreWithOffset(RegisterID rt, RegisterID rn, int32_t offset)
-    {
-        if (ARM64Assembler::canEncodeSImmOffset(offset)) {
-            storeUnscaledImmediate<datasize>(rt, rn, offset);
-            return true;
-        }
-        if (ARM64Assembler::canEncodePImmOffset<datasize>(offset)) {
-            storeUnsignedImmediate<datasize>(rt, rn, static_cast<unsigned>(offset));
-            return true;
-        }
-        return false;
-    }
+    bool tryStoreWithOffset(RegisterID rt, RegisterID rn, int32_t offset);
 
     template<int datasize>
-    ALWAYS_INLINE bool tryStoreWithOffset(FPRegisterID rt, RegisterID rn, int32_t offset)
-    {
-        if (ARM64Assembler::canEncodeSImmOffset(offset)) {
-            m_assembler.stur<datasize>(rt, rn, offset);
-            return true;
-        }
-        if (ARM64Assembler::canEncodePImmOffset<datasize>(offset)) {
-            m_assembler.str<datasize>(rt, rn, static_cast<unsigned>(offset));
-            return true;
-        }
-        return false;
-    }
+    bool tryStoreWithOffset(FPRegisterID rt, RegisterID rn, int32_t offset);
 
     Jump jumpAfterFloatingPointCompare(DoubleCondition cond)
     {
@@ -3413,6 +3340,43 @@ private:
     bool m_allowScratchRegister = true;
 };
 
+template<int datasize>
+ALWAYS_INLINE void MacroAssemblerARM64::loadUnsignedImmediate(RegisterID rt, RegisterID rn, unsigned pimm)
+{
+    m_assembler.ldr<datasize>(rt, rn, pimm);
+}
+
+template<int datasize>
+ALWAYS_INLINE void MacroAssemblerARM64::loadUnscaledImmediate(RegisterID rt, RegisterID rn, int simm)
+{
+    m_assembler.ldur<datasize>(rt, rn, simm);
+}
+
+template<int datasize>
+ALWAYS_INLINE void MacroAssemblerARM64::loadSignedAddressedByUnsignedImmediate(RegisterID rt, RegisterID rn, unsigned pimm)
+{
+    loadUnsignedImmediate<datasize>(rt, rn, pimm);
+}
+
+template<int datasize>
+ALWAYS_INLINE void MacroAssemblerARM64::loadSignedAddressedByUnscaledImmediate(RegisterID rt, RegisterID rn, int simm)
+{
+    loadUnscaledImmediate<datasize>(rt, rn, simm);
+}
+
+template<int datasize>
+ALWAYS_INLINE void MacroAssemblerARM64::storeUnsignedImmediate(RegisterID rt, RegisterID rn, unsigned pimm)
+{
+    m_assembler.str<datasize>(rt, rn, pimm);
+}
+
+template<int datasize>
+ALWAYS_INLINE void MacroAssemblerARM64::storeUnscaledImmediate(RegisterID rt, RegisterID rn, int simm)
+{
+    m_assembler.stur<datasize>(rt, rn, simm);
+}
+
+
 // Extend the {load,store}{Unsigned,Unscaled}Immediate templated general register methods to cover all load/store sizes
 template<>
 ALWAYS_INLINE void MacroAssemblerARM64::loadUnsignedImmediate<8>(RegisterID rt, RegisterID rn, unsigned pimm)
@@ -3486,6 +3450,77 @@ ALWAYS_INLINE void MacroAssemblerARM64::storeUnscaledImmediate<16>(RegisterID rt
     m_assembler.sturh(rt, rn, simm);
 }
 
+template<int datasize>
+ALWAYS_INLINE bool MacroAssemblerARM64::tryLoadSignedWithOffset(RegisterID rt, RegisterID rn, int32_t offset)
+{
+    if (ARM64Assembler::canEncodeSImmOffset(offset)) {
+        loadSignedAddressedByUnscaledImmediate<datasize>(rt, rn, offset);
+        return true;
+    }
+    if (ARM64Assembler::canEncodePImmOffset<datasize>(offset)) {
+        loadSignedAddressedByUnsignedImmediate<datasize>(rt, rn, static_cast<unsigned>(offset));
+        return true;
+    }
+    return false;
+}
+
+template<int datasize>
+ALWAYS_INLINE bool MacroAssemblerARM64::tryStoreWithOffset(RegisterID rt, RegisterID rn, int32_t offset)
+{
+    if (ARM64Assembler::canEncodeSImmOffset(offset)) {
+        storeUnscaledImmediate<datasize>(rt, rn, offset);
+        return true;
+    }
+    if (ARM64Assembler::canEncodePImmOffset<datasize>(offset)) {
+        storeUnsignedImmediate<datasize>(rt, rn, static_cast<unsigned>(offset));
+        return true;
+    }
+    return false;
+}
+
+template<int datasize>
+ALWAYS_INLINE bool MacroAssemblerARM64::tryStoreWithOffset(FPRegisterID rt, RegisterID rn, int32_t offset)
+{
+    if (ARM64Assembler::canEncodeSImmOffset(offset)) {
+        m_assembler.stur<datasize>(rt, rn, offset);
+        return true;
+    }
+    if (ARM64Assembler::canEncodePImmOffset<datasize>(offset)) {
+        m_assembler.str<datasize>(rt, rn, static_cast<unsigned>(offset));
+        return true;
+    }
+    return false;
+}
+
+
+template<int datasize>
+ALWAYS_INLINE bool MacroAssemblerARM64::tryLoadWithOffset(RegisterID rt, RegisterID rn, int32_t offset)
+{
+    if (ARM64Assembler::canEncodeSImmOffset(offset)) {
+        loadUnscaledImmediate<datasize>(rt, rn, offset);
+        return true;
+    }
+    if (ARM64Assembler::canEncodePImmOffset<datasize>(offset)) {
+        loadUnsignedImmediate<datasize>(rt, rn, static_cast<unsigned>(offset));
+        return true;
+    }
+    return false;
+}
+
+template<int datasize>
+ALWAYS_INLINE bool MacroAssemblerARM64::tryLoadWithOffset(FPRegisterID rt, RegisterID rn, int32_t offset)
+    {
+        if (ARM64Assembler::canEncodeSImmOffset(offset)) {
+            m_assembler.ldur<datasize>(rt, rn, offset);
+            return true;
+        }
+        if (ARM64Assembler::canEncodePImmOffset<datasize>(offset)) {
+            m_assembler.ldr<datasize>(rt, rn, static_cast<unsigned>(offset));
+            return true;
+        }
+        return false;
+    }
+
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index b97468ab7b..348ddb25d9 100644
--- a/src/qml/jsapi/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -409,7 +409,7 @@ bool QJSValue::isObject() const
     QV4::Value *val = QJSValuePrivate::getValue(this);
     if (!val)
         return false;
-    return val->as<Object>();
+    return val->as<QV4::Object>();
 }
 
 /*!
@@ -649,7 +649,7 @@ QVariant QJSValue::toVariant() const
     QV4::Value *val = QJSValuePrivate::valueForData(this, &scratch);
     Q_ASSERT(val);
 
-    if (Object *o = val->as<Object>())
+    if (QV4::Object *o = val->as<QV4::Object>())
         return o->engine()->toVariant(*val, /*typeHint*/ -1, /*createJSValueForObjects*/ false);
 
     if (String *s = val->stringValue())
@@ -849,7 +849,7 @@ QJSValue QJSValue::prototype() const
     if (!engine)
         return QJSValue();
     QV4::Scope scope(engine);
-    ScopedObject o(scope, QJSValuePrivate::getValue(this)->as<Object>());
+    ScopedObject o(scope, QJSValuePrivate::getValue(this)->as<QV4::Object>());
     if (!o)
         return QJSValue();
     ScopedObject p(scope, o->prototype());
@@ -931,7 +931,7 @@ static bool js_equal(const QString &string, const QV4::Value &value)
         return RuntimeHelpers::stringToNumber(string) == value.asDouble();
     if (value.isBoolean())
         return RuntimeHelpers::stringToNumber(string) == double(value.booleanValue());
-    if (Object *o = value.objectValue()) {
+    if (QV4::Object *o = value.objectValue()) {
         Scope scope(o->engine());
         ScopedValue p(scope, RuntimeHelpers::toPrimitive(value, PREFERREDTYPE_HINT));
         return js_equal(string, p);
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 816c259b9b..d63d42478a 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -102,10 +102,10 @@ QPair<QObject *, int> QObjectMethod::extractQtMethod(const QV4::FunctionObject *
     return qMakePair((QObject *)nullptr, -1);
 }
 
-static QPair<QObject *, int> extractQtSignal(const Value &value)
+static QPair<QObject *, int> extractQtSignal(const QV4::Value &value)
 {
     if (value.isObject()) {
-        QV4::ExecutionEngine *v4 = value.as<Object>()->engine();
+        QV4::ExecutionEngine *v4 = value.as<QV4::Object>()->engine();
         QV4::Scope scope(v4);
         QV4::ScopedFunctionObject function(scope, value);
         if (function)
@@ -1106,7 +1106,7 @@ struct CallArgument {
     inline void *dataPtr();
 
     inline void initAsType(int type);
-    inline void fromValue(int type, ExecutionEngine *, const Value &);
+    inline void fromValue(int type, ExecutionEngine *, const QV4::Value &);
     inline ReturnedValue toValue(ExecutionEngine *);
 
 private:
@@ -1304,7 +1304,7 @@ static int MatchScore(const QV4::Value &actual, int conversionType)
                 return 10;
         }
         }
-    } else if (const Object *obj = actual.as<Object>()) {
+    } else if (const QV4::Object *obj = actual.as<QV4::Object>()) {
         if (obj->as<QV4::VariantObject>()) {
             if (conversionType == qMetaTypeId<QVariant>())
                 return 0;
@@ -1720,7 +1720,7 @@ void CallArgument::fromValue(int callType, QV4::ExecutionEngine *engine, const Q
                || callType == qMetaTypeId<std::vector<QUrl>>()
                || callType == qMetaTypeId<std::vector<QModelIndex>>()) {
         queryEngine = true;
-        const QV4::Object* object = value.as<Object>();
+        const QV4::Object* object = value.as<QV4::Object>();
         if (callType == qMetaTypeId<std::vector<int>>()) {
             stdVectorIntPtr = nullptr;
             fromContainerValue<std::vector<int>>(object, callType, &CallArgument::stdVectorIntPtr, queryEngine);
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp
index e5a02fdc22..61176b3706 100644
--- a/src/qml/jsruntime/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
@@ -200,7 +200,7 @@ void StringPrototype::init(ExecutionEngine *engine, Object *ctor)
     defineDefaultProperty(QStringLiteral("trim"), method_trim);
 }
 
-static Heap::String *thisAsString(ExecutionEngine *v4, const Value *thisObject)
+static Heap::String *thisAsString(ExecutionEngine *v4, const QV4::Value *thisObject)
 {
     if (String *s = thisObject->stringValue())
         return s->d();
@@ -209,7 +209,7 @@ static Heap::String *thisAsString(ExecutionEngine *v4, const Value *thisObject)
     return thisObject->toString(v4);
 }
 
-static QString getThisString(ExecutionEngine *v4, const Value *thisObject)
+static QString getThisString(ExecutionEngine *v4, const QV4::Value *thisObject)
 {
     if (String *s = thisObject->stringValue())
         return s->toQString();
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index e73365e9b1..a1f5b01fa9 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -345,7 +345,7 @@ static struct InstrCount {
     if (engine->hasException) \
         goto catchException
 
-static inline Heap::CallContext *getScope(Value *stack, int level)
+static inline Heap::CallContext *getScope(QV4::Value *stack, int level)
 {
     Heap::ExecutionContext *scope = static_cast<ExecutionContext &>(stack[CallData::Context]).d();
     while (level > 0) {
@@ -362,7 +362,7 @@ static inline const QV4::Value &constant(Function *function, int index)
 }
 
 
-static bool compareEqual(Value lhs, Value rhs)
+static bool compareEqual(QV4::Value lhs, QV4::Value rhs)
 {
   redo:
     if (lhs.asReturnedValue() == rhs.asReturnedValue())
@@ -376,22 +376,22 @@ static bool compareEqual(Value lhs, Value rhs)
     }
 
     switch (lt) {
-    case Value::QT_ManagedOrUndefined:
+    case QV4::Value::QT_ManagedOrUndefined:
         if (lhs.isUndefined())
             return rhs.isNullOrUndefined();
         Q_FALLTHROUGH();
-    case Value::QT_ManagedOrUndefined1:
-    case Value::QT_ManagedOrUndefined2:
-    case Value::QT_ManagedOrUndefined3:
+    case QV4::Value::QT_ManagedOrUndefined1:
+    case QV4::Value::QT_ManagedOrUndefined2:
+    case QV4::Value::QT_ManagedOrUndefined3:
         // LHS: Managed
         switch (rt) {
-        case Value::QT_ManagedOrUndefined:
+        case QV4::Value::QT_ManagedOrUndefined:
             if (rhs.isUndefined())
                 return false;
             Q_FALLTHROUGH();
-        case Value::QT_ManagedOrUndefined1:
-        case Value::QT_ManagedOrUndefined2:
-        case Value::QT_ManagedOrUndefined3: {
+        case QV4::Value::QT_ManagedOrUndefined1:
+        case QV4::Value::QT_ManagedOrUndefined2:
+        case QV4::Value::QT_ManagedOrUndefined3: {
             // RHS: Managed
             Heap::Base *l = lhs.m();
             Heap::Base *r = rhs.m();
@@ -409,12 +409,12 @@ static bool compareEqual(Value lhs, Value rhs)
             }
             return false;
         }
-        case Value::QT_Empty:
+        case QV4::Value::QT_Empty:
             Q_UNREACHABLE();
-        case Value::QT_Null:
+        case QV4::Value::QT_Null:
             return false;
-        case Value::QT_Bool:
-        case Value::QT_Int:
+        case QV4::Value::QT_Bool:
+        case QV4::Value::QT_Int:
             rhs = Primitive::fromDouble(rhs.int_32());
             // fall through
         default: // double
@@ -424,22 +424,22 @@ static bool compareEqual(Value lhs, Value rhs)
                 lhs = Primitive::fromReturnedValue(RuntimeHelpers::objectDefaultValue(&static_cast<QV4::Object &>(lhs), PREFERREDTYPE_HINT));
         }
         goto redo;
-    case Value::QT_Empty:
+    case QV4::Value::QT_Empty:
         Q_UNREACHABLE();
-    case Value::QT_Null:
+    case QV4::Value::QT_Null:
         return rhs.isNull();
-    case Value::QT_Bool:
-    case Value::QT_Int:
+    case QV4::Value::QT_Bool:
+    case QV4::Value::QT_Int:
         switch (rt) {
-        case Value::QT_ManagedOrUndefined:
-        case Value::QT_ManagedOrUndefined1:
-        case Value::QT_ManagedOrUndefined2:
-        case Value::QT_ManagedOrUndefined3:
-        case Value::QT_Empty:
-        case Value::QT_Null:
+        case QV4::Value::QT_ManagedOrUndefined:
+        case QV4::Value::QT_ManagedOrUndefined1:
+        case QV4::Value::QT_ManagedOrUndefined2:
+        case QV4::Value::QT_ManagedOrUndefined3:
+        case QV4::Value::QT_Empty:
+        case QV4::Value::QT_Null:
             Q_UNREACHABLE();
-        case Value::QT_Bool:
-        case Value::QT_Int:
+        case QV4::Value::QT_Bool:
+        case QV4::Value::QT_Int:
             return lhs.int_32() == rhs.int_32();
         default: // double
             return lhs.int_32() == rhs.doubleValue();
@@ -450,29 +450,29 @@ static bool compareEqual(Value lhs, Value rhs)
     }
 }
 
-static bool compareEqualInt(Value &accumulator, Value lhs, int rhs)
+static bool compareEqualInt(QV4::Value &accumulator, QV4::Value lhs, int rhs)
 {
   redo:
     switch (lhs.quickType()) {
-    case Value::QT_ManagedOrUndefined:
+    case QV4::Value::QT_ManagedOrUndefined:
         if (lhs.isUndefined())
             return false;
         Q_FALLTHROUGH();
-    case Value::QT_ManagedOrUndefined1:
-    case Value::QT_ManagedOrUndefined2:
-    case Value::QT_ManagedOrUndefined3:
+    case QV4::Value::QT_ManagedOrUndefined1:
+    case QV4::Value::QT_ManagedOrUndefined2:
+    case QV4::Value::QT_ManagedOrUndefined3:
         // LHS: Managed
         if (lhs.m()->vtable()->isString)
             return RuntimeHelpers::stringToNumber(static_cast<String &>(lhs).toQString()) == rhs;
         accumulator = lhs;
         lhs = Primitive::fromReturnedValue(RuntimeHelpers::objectDefaultValue(&static_cast<QV4::Object &>(accumulator), PREFERREDTYPE_HINT));
         goto redo;
-    case Value::QT_Empty:
+    case QV4::Value::QT_Empty:
         Q_UNREACHABLE();
-    case Value::QT_Null:
+    case QV4::Value::QT_Null:
         return false;
-    case Value::QT_Bool:
-    case Value::QT_Int:
+    case QV4::Value::QT_Bool:
+    case QV4::Value::QT_Int:
         return lhs.int_32() == rhs;
     default: // double
         return lhs.doubleValue() == rhs;
@@ -500,11 +500,11 @@ static bool compareEqualInt(Value &accumulator, Value lhs, int rhs)
         } \
     } while (false)
 
-QV4::ReturnedValue VME::exec(const FunctionObject *fo, const Value *thisObject, const Value *argv, int argc)
+QV4::ReturnedValue VME::exec(const FunctionObject *fo, const QV4::Value *thisObject, const QV4::Value *argv, int argc)
 {
     qt_v4ResolvePendingBreakpointsHook();
     ExecutionEngine *engine;
-    Value *stack;
+    QV4::Value *stack;
     CppStackFrame frame;
     frame.originalArguments = argv;
     frame.originalArgumentsCount = argc;
-- 
cgit v1.2.3