Move data of FunctionObject into an inner struct

Change-Id: Ic00b1761565f9f8881b665a3fecca723239e2279
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 13 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h
index 53f2481ba1..5058b7aa5c 100644
--- a/src/qml/jsruntime/qv4functionobject_p.h
+++ b/src/qml/jsruntime/qv4functionobject_p.h
@@ -111,11 +111,20 @@ struct Q_QML_EXPORT FunctionObject: Object {
         Index_ProtoConstructor = 0
     };
 
-    ExecutionContext *scope;
+    struct Data {
+        ExecutionContext *scope;
+        Function *function;
+
+    };
+    Data data;
+
+
+    ExecutionContext *scope() { return data.scope; }
+    Function *function() { return data.function; }
+
     ReturnedValue name();
-    unsigned int formalParameterCount() { return function ? function->compiledFunction->nFormals : 0; }
-    unsigned int varCount() { return function ? function->compiledFunction->nLocals : 0; }
-    Function *function;
+    unsigned int formalParameterCount() { return function() ? function()->compiledFunction->nFormals : 0; }
+    unsigned int varCount() { return function() ? function()->compiledFunction->nLocals : 0; }
 
     FunctionObject(ExecutionContext *scope, const StringRef name, bool createProto = false);
     FunctionObject(ExecutionContext *scope, const QString &name = QString(), bool createProto = false);