Unify layout of function objects

Ensure we have the proto property at always the same place.
This will be used in a subsequent commit to optimize accesses
to the prototype property e.g. when doing instanceof
operations or constructor calls.

Change-Id: I6e9a19e0b7d0e8ab583648a60d1978f5cf838b06
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>

1 files changed, 3 insertions, 6 deletions

diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h
index 11ddd9a211..8a2c84a8f6 100644
--- a/src/qml/jsruntime/qv4functionobject_p.h
+++ b/src/qml/jsruntime/qv4functionobject_p.h
@@ -76,7 +76,8 @@ namespace Heap {
 DECLARE_HEAP_OBJECT(FunctionObject, Object) {
     DECLARE_MARKOBJECTS(FunctionObject);
     enum {
-        Index_ProtoConstructor = 0
+        Index_ProtoConstructor = 0,
+        Index_Prototype = 0
     };
 
     bool isConstructor() const {
@@ -111,7 +112,7 @@ struct IndexedBuiltinFunction : FunctionObject {
 
 struct ArrowFunction : FunctionObject {
     enum {
-        Index_Name,
+        Index_Name = Index_Prototype + 1,
         Index_Length
     };
     void init(QV4::ExecutionContext *scope, Function *function, QV4::String *name = nullptr);
@@ -122,10 +123,6 @@ struct ArrowFunction : FunctionObject {
 
 DECLARE_HEAP_OBJECT(ScriptFunction, ArrowFunction) {
     DECLARE_MARKOBJECTS(ScriptFunction)
-    enum {
-        Index_Name,
-        Index_Length
-    };
     void init(QV4::ExecutionContext *scope, Function *function);
 };