1 files changed, 472 insertions, 182 deletions

diff --git a/src/qml/jsruntime/qv4runtimeapi_p.h b/src/qml/jsruntime/qv4runtimeapi_p.h
index 302facba06..0312522d90 100644
--- a/src/qml/jsruntime/qv4runtimeapi_p.h
+++ b/src/qml/jsruntime/qv4runtimeapi_p.h
@@ -57,202 +57,492 @@ QT_BEGIN_NAMESPACE
 namespace QV4 {
 
 typedef uint Bool;
-struct NoThrowEngine;
 
-namespace {
-template <typename T>
-struct ExceptionCheck {
-    enum { NeedsCheck = 1 };
-};
-// push_catch and pop context methods shouldn't check for exceptions
-template <>
-struct ExceptionCheck<void (*)(QV4::NoThrowEngine *)> {
-    enum { NeedsCheck = 0 };
-};
-template <typename A>
-struct ExceptionCheck<void (*)(A, QV4::NoThrowEngine)> {
-    enum { NeedsCheck = 0 };
-};
-template <>
-struct ExceptionCheck<QV4::ReturnedValue (*)(QV4::NoThrowEngine *)> {
-    enum { NeedsCheck = 0 };
-};
-template <typename A>
-struct ExceptionCheck<QV4::ReturnedValue (*)(QV4::NoThrowEngine *, A)> {
-    enum { NeedsCheck = 0 };
-};
-template <typename A, typename B>
-struct ExceptionCheck<QV4::ReturnedValue (*)(QV4::NoThrowEngine *, A, B)> {
-    enum { NeedsCheck = 0 };
-};
-template <typename A, typename B, typename C>
-struct ExceptionCheck<void (*)(QV4::NoThrowEngine *, A, B, C)> {
-    enum { NeedsCheck = 0 };
-};
-} // anonymous namespace
-
-#define FOR_EACH_RUNTIME_METHOD(F) \
-    /* call */ \
-    F(ReturnedValue, callGlobalLookup, (ExecutionEngine *engine, uint index, CallData *callData)) \
-    F(ReturnedValue, callActivationProperty, (ExecutionEngine *engine, int nameIndex, CallData *callData)) \
-    F(ReturnedValue, callQmlScopeObjectProperty, (ExecutionEngine *engine, int propertyIndex, CallData *callData)) \
-    F(ReturnedValue, callQmlContextObjectProperty, (ExecutionEngine *engine, int propertyIndex, CallData *callData)) \
-    F(ReturnedValue, callProperty, (ExecutionEngine *engine, int nameIndex, CallData *callData)) \
-    F(ReturnedValue, callPropertyLookup, (ExecutionEngine *engine, uint index, CallData *callData)) \
-    F(ReturnedValue, callElement, (ExecutionEngine *engine, const Value &index, CallData *callData)) \
-    F(ReturnedValue, callValue, (ExecutionEngine *engine, const Value &func, CallData *callData)) \
-    \
-    /* construct */ \
-    F(ReturnedValue, constructGlobalLookup, (ExecutionEngine *engine, uint index, CallData *callData)) \
-    F(ReturnedValue, constructActivationProperty, (ExecutionEngine *engine, int nameIndex, CallData *callData)) \
-    F(ReturnedValue, constructProperty, (ExecutionEngine *engine, int nameIndex, CallData *callData)) \
-    F(ReturnedValue, constructPropertyLookup, (ExecutionEngine *engine, uint index, CallData *callData)) \
-    F(ReturnedValue, constructValue, (ExecutionEngine *engine, const Value &func, CallData *callData)) \
-    \
-    /* set & get */ \
-    F(void, setActivationProperty, (ExecutionEngine *engine, int nameIndex, const Value &value)) \
-    F(void, setProperty, (ExecutionEngine *engine, const Value &object, int nameIndex, const Value &value)) \
-    F(void, setElement, (ExecutionEngine *engine, const Value &object, const Value &index, const Value &value)) \
-    F(ReturnedValue, getProperty, (ExecutionEngine *engine, const Value &object, int nameIndex)) \
-    F(ReturnedValue, getActivationProperty, (ExecutionEngine *engine, int nameIndex)) \
-    F(ReturnedValue, getElement, (ExecutionEngine *engine, const Value &object, const Value &index)) \
-    \
-    /* typeof */  \
-    F(ReturnedValue, typeofValue, (ExecutionEngine *engine, const Value &val)) \
-    F(ReturnedValue, typeofName, (ExecutionEngine *engine, int nameIndex)) \
-    F(ReturnedValue, typeofScopeObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex)) \
-    F(ReturnedValue, typeofContextObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex)) \
-    F(ReturnedValue, typeofMember, (ExecutionEngine *engine, const Value &base, int nameIndex)) \
-    F(ReturnedValue, typeofElement, (ExecutionEngine *engine, const Value &base, const Value &index)) \
-    \
-    /* delete */ \
-    F(ReturnedValue, deleteElement, (ExecutionEngine *engine, const Value &base, const Value &index)) \
-    F(ReturnedValue, deleteMember, (ExecutionEngine *engine, const Value &base, int nameIndex)) \
-    F(ReturnedValue, deleteMemberString, (ExecutionEngine *engine, const Value &base, String *name)) \
-    F(ReturnedValue, deleteName, (ExecutionEngine *engine, int nameIndex)) \
-    \
-    /* exceptions & scopes */ \
-    F(void, throwException, (ExecutionEngine *engine, const Value &value)) \
-    F(ReturnedValue, unwindException, (ExecutionEngine *engine)) \
-    F(void, pushWithScope, (const Value &o, NoThrowEngine *engine)) \
-    F(void, pushCatchScope, (NoThrowEngine *engine, int exceptionVarNameIndex)) \
-    F(void, popScope, (NoThrowEngine *engine)) \
-    \
-    /* closures */ \
-    F(ReturnedValue, closure, (ExecutionEngine *engine, int functionId)) \
-    \
-    /* function header */ \
-    F(void, declareVar, (ExecutionEngine *engine, bool deletable, int nameIndex)) \
-    F(ReturnedValue, setupArgumentsObject, (ExecutionEngine *engine)) \
-    F(void, convertThisToObject, (ExecutionEngine *engine)) \
-    \
-    /* literals */ \
-    F(ReturnedValue, arrayLiteral, (ExecutionEngine *engine, Value *values, uint length)) \
-    F(ReturnedValue, objectLiteral, (ExecutionEngine *engine, const Value *args, int classId, int arrayValueCount, int arrayGetterSetterCountAndFlags)) \
-    F(ReturnedValue, regexpLiteral, (ExecutionEngine *engine, int id)) \
-    \
-    /* foreach */ \
-    F(ReturnedValue, foreachIterator, (ExecutionEngine *engine, const Value &in)) \
-    F(ReturnedValue, foreachNextPropertyName, (const Value &foreach_iterator)) \
-    \
-    /* unary operators */ \
-    F(ReturnedValue, uPlus, (const Value &value)) \
-    F(ReturnedValue, uMinus, (const Value &value)) \
-    F(ReturnedValue, uNot, (const Value &value)) \
-    F(ReturnedValue, complement, (const Value &value)) \
-    F(ReturnedValue, increment, (const Value &value)) \
-    F(ReturnedValue, decrement, (const Value &value)) \
-    \
-    /* binary operators */ \
-    F(ReturnedValue, instanceof, (ExecutionEngine *engine, const Value &left, const Value &right)) \
-    F(ReturnedValue, in, (ExecutionEngine *engine, const Value &left, const Value &right)) \
-    F(ReturnedValue, add, (ExecutionEngine *engine, const Value &left, const Value &right)) \
-    F(ReturnedValue, addString, (ExecutionEngine *engine, const Value &left, const Value &right)) \
-    F(ReturnedValue, bitOr, (const Value &left, const Value &right)) \
-    F(ReturnedValue, bitXor, (const Value &left, const Value &right)) \
-    F(ReturnedValue, bitAnd, (const Value &left, const Value &right)) \
-    F(ReturnedValue, sub, (const Value &left, const Value &right)) \
-    F(ReturnedValue, mul, (const Value &left, const Value &right)) \
-    F(ReturnedValue, div, (const Value &left, const Value &right)) \
-    F(ReturnedValue, mod, (const Value &left, const Value &right)) \
-    F(ReturnedValue, shl, (const Value &left, const Value &right)) \
-    F(ReturnedValue, shr, (const Value &left, const Value &right)) \
-    F(ReturnedValue, ushr, (const Value &left, const Value &right)) \
-    F(ReturnedValue, greaterThan, (const Value &left, const Value &right)) \
-    F(ReturnedValue, lessThan, (const Value &left, const Value &right)) \
-    F(ReturnedValue, greaterEqual, (const Value &left, const Value &right)) \
-    F(ReturnedValue, lessEqual, (const Value &left, const Value &right)) \
-    F(ReturnedValue, equal, (const Value &left, const Value &right)) \
-    F(ReturnedValue, notEqual, (const Value &left, const Value &right)) \
-    F(ReturnedValue, strictEqual, (const Value &left, const Value &right)) \
-    F(ReturnedValue, strictNotEqual, (const Value &left, const Value &right)) \
-    \
-    /* comparisons */ \
-    F(Bool, compareGreaterThan, (const Value &l, const Value &r)) \
-    F(Bool, compareLessThan, (const Value &l, const Value &r)) \
-    F(Bool, compareGreaterEqual, (const Value &l, const Value &r)) \
-    F(Bool, compareLessEqual, (const Value &l, const Value &r)) \
-    F(Bool, compareEqual, (const Value &left, const Value &right)) \
-    F(Bool, compareNotEqual, (const Value &left, const Value &right)) \
-    F(Bool, compareStrictEqual, (const Value &left, const Value &right)) \
-    F(Bool, compareStrictNotEqual, (const Value &left, const Value &right)) \
-    \
-    F(Bool, compareInstanceof, (ExecutionEngine *engine, const Value &left, const Value &right)) \
-    F(Bool, compareIn, (ExecutionEngine *engine, const Value &left, const Value &right)) \
-    \
-    /* conversions */ \
-    F(Bool, toBoolean, (const Value &value)) \
-    F(ReturnedValue, toDouble, (const Value &value)) \
-    F(int, toInt, (const Value &value)) \
-    F(int, doubleToInt, (const double &d)) \
-    F(unsigned, toUInt, (const Value &value)) \
-    F(unsigned, doubleToUInt, (const double &d)) \
-    \
-    /* qml */ \
-    F(ReturnedValue, getQmlContext, (NoThrowEngine *engine)) \
-    F(ReturnedValue, getQmlImportedScripts, (NoThrowEngine *engine)) \
-    F(ReturnedValue, getQmlSingleton, (NoThrowEngine *engine, int nameIndex)) \
-    F(ReturnedValue, getQmlAttachedProperty, (ExecutionEngine *engine, int attachedPropertiesId, int propertyIndex)) \
-    F(ReturnedValue, getQmlScopeObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex, bool captureRequired)) \
-    F(ReturnedValue, getQmlContextObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex, bool captureRequired)) \
-    F(ReturnedValue, getQmlQObjectProperty, (ExecutionEngine *engine, const Value &object, int propertyIndex, bool captureRequired)) \
-    F(ReturnedValue, getQmlSingletonQObjectProperty, (ExecutionEngine *engine, const Value &object, int propertyIndex, bool captureRequired)) \
-    F(ReturnedValue, getQmlIdObject, (ExecutionEngine *engine, const Value &context, uint index)) \
-    \
-    F(void, setQmlScopeObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex, const Value &value)) \
-    F(void, setQmlContextObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex, const Value &value)) \
-    F(void, setQmlQObjectProperty, (ExecutionEngine *engine, const Value &object, int propertyIndex, const Value &value))
 
 struct Q_QML_PRIVATE_EXPORT Runtime {
-    Runtime();
-
     typedef ReturnedValue (*UnaryOperation)(const Value &value);
     typedef ReturnedValue (*BinaryOperation)(const Value &left, const Value &right);
-    typedef ReturnedValue (*BinaryOperationContext)(ExecutionEngine *engine, const Value &left, const Value &right);
+    typedef ReturnedValue (*BinaryOperationContext)(ExecutionEngine *, const Value &left, const Value &right);
+
+    enum class Throws { No, Yes };
+    enum class ChangesContext { No, Yes };
+    enum class Pure { No, Yes };
+    enum class LastArgumentIsOutputValue { No, Yes };
+
+    template<Throws t, ChangesContext c = ChangesContext::No, Pure p = Pure::No,
+             LastArgumentIsOutputValue out = LastArgumentIsOutputValue::No>
+    struct Method
+    {
+        static constexpr bool throws = t == Throws::Yes;
+        static constexpr bool changesContext = c == ChangesContext::Yes;
+        static constexpr bool pure = p == Pure::Yes;
+        static constexpr bool lastArgumentIsOutputValue = out == LastArgumentIsOutputValue::Yes;
+    };
+    using PureMethod = Method<Throws::No, ChangesContext::No, Pure::Yes>;
+    using IteratorMethod = Method<Throws::Yes, ChangesContext::No, Pure::No,
+                                  LastArgumentIsOutputValue::Yes>;
+
+    /* call */
+    struct Q_QML_PRIVATE_EXPORT CallGlobalLookup : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, uint, Value[], int);
+    };
+    struct Q_QML_PRIVATE_EXPORT CallName : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, int, Value[], int);
+    };
+    struct Q_QML_PRIVATE_EXPORT CallProperty : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, int, Value[], int);
+    };
+    struct Q_QML_PRIVATE_EXPORT CallPropertyLookup : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, uint, Value[], int);
+    };
+    struct Q_QML_PRIVATE_EXPORT CallElement : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, Value[], int);
+    };
+    struct Q_QML_PRIVATE_EXPORT CallValue : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, Value[], int);
+    };
+    struct Q_QML_PRIVATE_EXPORT CallWithReceiver : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, Value[], int);
+    };
+    struct Q_QML_PRIVATE_EXPORT CallPossiblyDirectEval : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, Value[], int);
+    };
+    struct Q_QML_PRIVATE_EXPORT CallWithSpread : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, Value[], int);
+    };
+    struct Q_QML_PRIVATE_EXPORT TailCall : Method<Throws::Yes>
+    {
+        static ReturnedValue call(CppStackFrame *, ExecutionEngine *);
+    };
+
+    /* construct */
+    struct Q_QML_PRIVATE_EXPORT Construct : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, Value[], int);
+    };
+    struct Q_QML_PRIVATE_EXPORT ConstructWithSpread : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, Value[], int);
+    };
+
+    /* load & store */
+    struct Q_QML_PRIVATE_EXPORT StoreNameStrict : Method<Throws::Yes>
+    {
+        static void call(ExecutionEngine *, int, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT StoreNameSloppy : Method<Throws::Yes>
+    {
+        static void call(ExecutionEngine *, int, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT StoreProperty : Method<Throws::Yes>
+    {
+        static void call(ExecutionEngine *, const Value &, int, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT StoreElement : Method<Throws::Yes>
+    {
+        static void call(ExecutionEngine *, const Value &, const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT StoreElement_traced : Method<Throws::Yes>
+    {
+        static void call(ExecutionEngine *, const Value &, const Value &, const Value &, quint8 *);
+    };
+    struct Q_QML_PRIVATE_EXPORT LoadProperty : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, int);
+    };
+    struct Q_QML_PRIVATE_EXPORT LoadName : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, int);
+    };
+    struct Q_QML_PRIVATE_EXPORT LoadElement : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT LoadElement_Traced : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, quint8 *);
+    };
+    struct Q_QML_PRIVATE_EXPORT LoadSuperProperty : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT StoreSuperProperty : Method<Throws::Yes>
+    {
+        static void call(ExecutionEngine *, const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT LoadSuperConstructor : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT LoadGlobalLookup : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, Function *, int);
+    };
+    struct Q_QML_PRIVATE_EXPORT GetLookup : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, Function *, const Value &, int);
+    };
+    struct Q_QML_PRIVATE_EXPORT SetLookupStrict : Method<Throws::Yes>
+    {
+        static void call(Function *, const Value &, int, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT SetLookupSloppy : Method<Throws::Yes>
+    {
+        static void call(Function *, const Value &, int, const Value &);
+    };
+
+    /* typeof */
+    struct Q_QML_PRIVATE_EXPORT TypeofValue : PureMethod
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT TypeofName : Method<Throws::No>
+    {
+        static ReturnedValue call(ExecutionEngine *, int);
+    };
+
+    /* delete */
+    struct Q_QML_PRIVATE_EXPORT DeleteProperty_NoThrow : Method<Throws::No>
+    {
+        static Bool call(ExecutionEngine *, const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT DeleteProperty : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, Function *, const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT DeleteName_NoThrow : Method<Throws::No>
+    {
+        static Bool call(ExecutionEngine *, int);
+    };
+    struct Q_QML_PRIVATE_EXPORT DeleteName : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, Function *, int);
+    };
+
+    /* exceptions & scopes */
+    struct Q_QML_PRIVATE_EXPORT ThrowException : Method<Throws::Yes>
+    {
+        static void call(ExecutionEngine *, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT PushCallContext : Method<Throws::No, ChangesContext::Yes>
+    {
+        static void call(CppStackFrame *);
+    };
+    struct Q_QML_PRIVATE_EXPORT PushWithContext : Method<Throws::Yes, ChangesContext::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT PushCatchContext : Method<Throws::No, ChangesContext::Yes>
+    {
+        static void call(ExecutionEngine *, int, int);
+    };
+    struct Q_QML_PRIVATE_EXPORT PushBlockContext : Method<Throws::No, ChangesContext::Yes>
+    {
+        static void call(ExecutionEngine *, int);
+    };
+    struct Q_QML_PRIVATE_EXPORT CloneBlockContext : Method<Throws::No, ChangesContext::Yes>
+    {
+        static void call(ExecutionEngine *);
+    };
+    struct Q_QML_PRIVATE_EXPORT PushScriptContext : Method<Throws::No, ChangesContext::Yes>
+    {
+        static void call(ExecutionEngine *, int);
+    };
+    struct Q_QML_PRIVATE_EXPORT PopScriptContext : Method<Throws::No, ChangesContext::Yes>
+    {
+        static void call(ExecutionEngine *);
+    };
+    struct Q_QML_PRIVATE_EXPORT ThrowReferenceError : Method<Throws::Yes>
+    {
+        static void call(ExecutionEngine *, int);
+    };
+    struct Q_QML_PRIVATE_EXPORT ThrowOnNullOrUndefined : Method<Throws::Yes>
+    {
+        static void call(ExecutionEngine *, const Value &);
+    };
+
+    /* closures */
+    struct Q_QML_PRIVATE_EXPORT Closure : Method<Throws::No>
+    {
+        static ReturnedValue call(ExecutionEngine *, int);
+    };
+
+    /* Function header */
+    struct Q_QML_PRIVATE_EXPORT ConvertThisToObject : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT DeclareVar : Method<Throws::Yes>
+    {
+        static void call(ExecutionEngine *, Bool, int);
+    };
+    struct Q_QML_PRIVATE_EXPORT CreateMappedArgumentsObject : Method<Throws::No>
+    {
+        static ReturnedValue call(ExecutionEngine *);
+    };
+    struct Q_QML_PRIVATE_EXPORT CreateUnmappedArgumentsObject : Method<Throws::No>
+    {
+        static ReturnedValue call(ExecutionEngine *);
+    };
+    struct Q_QML_PRIVATE_EXPORT CreateRestParameter : PureMethod
+    {
+        static ReturnedValue call(ExecutionEngine *, int);
+    };
 
-#define DEFINE_RUNTIME_METHOD_ENUM(returnvalue, name, args) name,
-    enum RuntimeMethods {
-        FOR_EACH_RUNTIME_METHOD(DEFINE_RUNTIME_METHOD_ENUM)
-        RuntimeMethodCount,
-        InvalidRuntimeMethod = RuntimeMethodCount
+    /* literals */
+    struct Q_QML_PRIVATE_EXPORT ArrayLiteral : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, Value[], uint);
+    };
+    struct Q_QML_PRIVATE_EXPORT ObjectLiteral : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, int, Value[], int);
+    };
+    struct Q_QML_PRIVATE_EXPORT CreateClass : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, int, const Value &, Value[]);
     };
-#undef DEFINE_RUNTIME_METHOD_ENUM
 
-    void *runtimeMethods[RuntimeMethodCount];
+    /* for-in, for-of and array destructuring */
+    struct Q_QML_PRIVATE_EXPORT GetIterator : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, int);
+    };
+    struct Q_QML_PRIVATE_EXPORT IteratorNext : IteratorMethod
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, Value *);
+    };
+    struct Q_QML_PRIVATE_EXPORT IteratorNextForYieldStar : IteratorMethod
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, Value *);
+    };
+    struct Q_QML_PRIVATE_EXPORT IteratorClose : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT DestructureRestElement : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &);
+    };
 
-    static uint runtimeMethodOffset(RuntimeMethods method) { return method*QT_POINTER_SIZE; }
+    /* conversions */
+    struct Q_QML_PRIVATE_EXPORT ToObject : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT ToBoolean : PureMethod
+    {
+        static Bool call(const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT ToNumber : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &);
+    };
+    /* unary operators */
+    struct Q_QML_PRIVATE_EXPORT UMinus : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &);
+    };
 
-#define RUNTIME_METHOD(returnvalue, name, args) \
-    typedef returnvalue (*Method_##name)args; \
-    enum { Method_##name##_NeedsExceptionCheck = ExceptionCheck<Method_##name>::NeedsCheck }; \
-    static returnvalue method_##name args;
-    FOR_EACH_RUNTIME_METHOD(RUNTIME_METHOD)
-#undef RUNTIME_METHOD
+    /* binary operators */
+    struct Q_QML_PRIVATE_EXPORT Instanceof : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT In : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT Add : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT Sub : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT Mul : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT Div : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT Mod : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT Exp : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT BitAnd : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT BitOr : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT BitXor : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT Shl : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT Shr : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT UShr : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT GreaterThan : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT LessThan : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT GreaterEqual : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT LessEqual : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT Equal : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT NotEqual : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT StrictEqual : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT StrictNotEqual : Method<Throws::Yes>
+    {
+        static ReturnedValue call(const Value &, const Value &);
+    };
+
+    /* comparisons */
+    struct Q_QML_PRIVATE_EXPORT CompareGreaterThan : Method<Throws::Yes>
+    {
+        static Bool call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT CompareLessThan : Method<Throws::Yes>
+    {
+        static Bool call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT CompareGreaterEqual : Method<Throws::Yes>
+    {
+        static Bool call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT CompareLessEqual : Method<Throws::Yes>
+    {
+        static Bool call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT CompareEqual : Method<Throws::Yes>
+    {
+        static Bool call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT CompareNotEqual : Method<Throws::Yes>
+    {
+        static Bool call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT CompareStrictEqual : Method<Throws::Yes>
+    {
+        static Bool call(const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT CompareStrictNotEqual : Method<Throws::Yes>
+    {
+        static Bool call(const Value &, const Value &);
+    };
+
+    struct Q_QML_PRIVATE_EXPORT CompareInstanceof : Method<Throws::Yes>
+    {
+        static Bool call(ExecutionEngine *, const Value &, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT CompareIn : Method<Throws::Yes>
+    {
+        static Bool call(ExecutionEngine *, const Value &, const Value &);
+    };
+
+    struct Q_QML_PRIVATE_EXPORT RegexpLiteral : PureMethod
+    {
+        static ReturnedValue call(ExecutionEngine *, int);
+    };
+    struct Q_QML_PRIVATE_EXPORT GetTemplateObject : PureMethod
+    {
+        static ReturnedValue call(Function *, int);
+    };
+
+    /* qml */
+    struct Q_QML_PRIVATE_EXPORT LoadQmlContext : Method<Throws::No>
+    {
+        static ReturnedValue call(ExecutionEngine *);
+    };
+    struct Q_QML_PRIVATE_EXPORT LoadQmlImportedScripts : Method<Throws::No>
+    {
+        static ReturnedValue call(ExecutionEngine *);
+    };
+    struct Q_QML_PRIVATE_EXPORT LoadQmlScopeObjectProperty : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, int, Bool);
+    };
+    struct Q_QML_PRIVATE_EXPORT LoadQmlContextObjectProperty : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, int, Bool);
+    };
+    struct Q_QML_PRIVATE_EXPORT LoadQmlIdObject : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, uint);
+    };
+    struct Q_QML_PRIVATE_EXPORT CallQmlScopeObjectProperty : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, int, Value[], int);
+    };
+    struct Q_QML_PRIVATE_EXPORT CallQmlContextObjectProperty : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, const Value &, int, Value[], int);
+    };
 
+    struct Q_QML_PRIVATE_EXPORT StoreQmlScopeObjectProperty : Method<Throws::Yes>
+    {
+        static void call(ExecutionEngine *, const Value &, int, const Value &);
+    };
+    struct Q_QML_PRIVATE_EXPORT StoreQmlContextObjectProperty : Method<Throws::Yes>
+    {
+        static void call(ExecutionEngine *, const Value &, int, const Value &);
+    };
+
+    struct StackOffsets {
+        static const int tailCall_function   = -1;
+        static const int tailCall_thisObject = -2;
+        static const int tailCall_argv       = -3;
+        static const int tailCall_argc       = -4;
+    };
 };
 
 static_assert(std::is_standard_layout<Runtime>::value, "Runtime needs to be standard layout in order for us to be able to use offsetof");
-static_assert(offsetof(Runtime, runtimeMethods) == 0, "JIT expects this to be the first member");
 static_assert(sizeof(Runtime::BinaryOperation) == sizeof(void*), "JIT expects a function pointer to fit into a regular pointer, for cross-compilation offset translation");
 
 } // namespace QV4