Cleanups in Value/Primitive

Get rid of Primitive and move the corresponding methods
directly into Value. Mark many methods in Value as
constexpr and turn Value into a POD type again.

Keep Primitive as a pure alias to Value for source
compatibility of other modules that might be using it.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4stackframe_p.h b/src/qml/jsruntime/qv4stackframe_p.h
index 6f21058e91..dd68c29a88 100644
--- a/src/qml/jsruntime/qv4stackframe_p.h
+++ b/src/qml/jsruntime/qv4stackframe_p.h
@@ -92,7 +92,7 @@ struct CallData
     }
 
     inline ReturnedValue argument(int i) const {
-        return i < argc() ? args[i].asReturnedValue() : Primitive::undefinedValue().asReturnedValue();
+        return i < argc() ? args[i].asReturnedValue() : Value::undefinedValue().asReturnedValue();
     }
 
     Value args[1];
@@ -160,7 +160,7 @@ struct Q_QML_EXPORT CppStackFrame {
         return requiredJSStackFrameSize(v4Function);
     }
     void setupJSFrame(Value *stackSpace, const Value &function, const Heap::ExecutionContext *scope,
-                      const Value &thisObject, const Value &newTarget = Primitive::undefinedValue()) {
+                      const Value &thisObject, const Value &newTarget = Value::undefinedValue()) {
         setupJSFrame(stackSpace, function, scope, thisObject, newTarget,
                      v4Function->nFormals, v4Function->compiledFunction->nRegisters);
     }
@@ -189,7 +189,7 @@ struct Q_QML_EXPORT CppStackFrame {
 
             const Value * tdzEnd = stackSpace + firstDeadZoneRegister + registerDeadZoneSize;
             for (Value *v = stackSpace + firstDeadZoneRegister; v < tdzEnd; ++v)
-                *v = Primitive::emptyValue().asReturnedValue();
+                *v = Value::emptyValue().asReturnedValue();
         }
     }
 #endif