From fa4f49169ad9e7e4afc934b3c947936bf0fcafdc Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 12 May 2017 09:33:25 +0200
Subject: Move a few more members from ExecutionEngine to EngineBase

Change-Id: I5d1e0d2251e04cc871f9c298849aafac17f23fbf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/qml/jsruntime/qv4engine.cpp |  4 +---
 src/qml/jsruntime/qv4engine_p.h | 11 -----------
 src/qml/memory/qv4mmdefs_p.h    |  8 ++++++++
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 0b61c6e7e6..b72e1d9dcf 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -130,10 +130,8 @@ QQmlEngine *ExecutionEngine::qmlEngine() const
 qint32 ExecutionEngine::maxCallDepth = -1;
 
 ExecutionEngine::ExecutionEngine(EvalISelFactory *factory)
-    : callDepth(0)
-    , executableAllocator(new QV4::ExecutableAllocator)
+    : executableAllocator(new QV4::ExecutableAllocator)
     , regExpAllocator(new QV4::ExecutableAllocator)
-    , currentContext(0)
     , bumperPointerAllocator(new WTF::BumpPointerAllocator)
     , jsStack(new WTF::PageAllocation)
     , globalCode(0)
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index 5182f24235..a57456c0fb 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -96,21 +96,14 @@ private:
     friend struct ExecutionContext;
     friend struct Heap::ExecutionContext;
 public:
-    qint32 callDepth;
-
     ExecutableAllocator *executableAllocator;
     ExecutableAllocator *regExpAllocator;
     QScopedPointer<EvalISelFactory> iselFactory;
 
-    ExecutionContext *currentContext;
-
-    Value *jsStackLimit;
-
     WTF::BumpPointerAllocator *bumperPointerAllocator; // Used by Yarr Regex engine.
 
     enum { JSStackLimit = 4*1024*1024 };
     WTF::PageAllocation *jsStack;
-    Value *jsStackBase;
 
     void pushForGC(Heap::Base *m) {
         *jsStackTop = m;
@@ -129,10 +122,6 @@ public:
         return ptr;
     }
 
-    IdentifierTable *identifierTable;
-
-    Object *globalObject;
-
     Function *globalCode;
 
 #ifdef V4_BOOTSTRAP
diff --git a/src/qml/memory/qv4mmdefs_p.h b/src/qml/memory/qv4mmdefs_p.h
index 6e820dfc0f..75cf4681d6 100644
--- a/src/qml/memory/qv4mmdefs_p.h
+++ b/src/qml/memory/qv4mmdefs_p.h
@@ -275,6 +275,14 @@ struct EngineBase {
 #endif
     MemoryManager *memoryManager = 0;
     Runtime runtime;
+
+    qint32 callDepth = 0;
+    Value *jsStackLimit = 0;
+    Value *jsStackBase = 0;
+
+    ExecutionContext *currentContext = 0;
+    IdentifierTable *identifierTable = 0;
+    Object *globalObject = 0;
 };
 #if defined(Q_CC_MSVC) || defined(Q_CC_GNU)
 #pragma pack(pop)
-- 
cgit v1.2.3