Merge remote-tracking branch 'origin/wip/new-backend' into dev

 Conflicts:
	src/qml/compiler/qv4isel_moth.cpp
	src/qml/compiler/qv4jsir_p.h
	src/qml/jsruntime/qv4engine_p.h
	src/qml/jsruntime/qv4vme_moth.cpp
	tests/auto/qml/qml.pro

Change-Id: Ia7b6ec24c7fcbcbb1786d9e798d2df294020ae37

1 files changed, 17 insertions, 12 deletions

diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h
index 88f9dfd85c..e0f5f3ffb1 100644
--- a/src/qml/jsruntime/qv4enginebase_p.h
+++ b/src/qml/jsruntime/qv4enginebase_p.h
@@ -57,31 +57,36 @@ QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
+struct CppStackFrame;
+
 // Base class for the execution engine
 
 #if defined(Q_CC_MSVC) || defined(Q_CC_GNU)
 #pragma pack(push, 1)
 #endif
-struct EngineBase {
-    Heap::ExecutionContext *current = 0;
+struct Q_QML_EXPORT EngineBase {
+
+    CppStackFrame *currentStackFrame = nullptr;
 
-    Value *jsStackTop = 0;
+    Value *jsStackTop = nullptr;
     quint8 hasException = false;
     quint8 writeBarrierActive = false;
     quint16 unused = 0;
 #if QT_POINTER_SIZE == 8
     quint8 padding[4];
 #endif
-    MemoryManager *memoryManager = 0;
+    MemoryManager *memoryManager = nullptr;
     Runtime runtime;
 
     qint32 callDepth = 0;
-    Value *jsStackLimit = 0;
-    Value *jsStackBase = 0;
+    Value *jsStackLimit = nullptr;
+    Value *jsStackBase = nullptr;
+
+    IdentifierTable *identifierTable = nullptr;
+    Object *globalObject = nullptr;
 
-    ExecutionContext *currentContext = 0;
-    IdentifierTable *identifierTable = 0;
-    Object *globalObject = 0;
+    // Exception handling
+    Value *exceptionValue = nullptr;
 
     enum {
         Class_Empty,
@@ -90,7 +95,7 @@ struct EngineBase {
         Class_SimpleArrayData,
         Class_SparseArrayData,
         Class_ExecutionContext,
-        Class_SimpleCallContext,
+        Class_CallContext,
         Class_Object,
         Class_ArrayObject,
         Class_FunctionObject,
@@ -115,8 +120,8 @@ struct EngineBase {
 #endif
 
 Q_STATIC_ASSERT(std::is_standard_layout<EngineBase>::value);
-Q_STATIC_ASSERT(offsetof(EngineBase, current) == 0);
-Q_STATIC_ASSERT(offsetof(EngineBase, jsStackTop) == offsetof(EngineBase, current) + QT_POINTER_SIZE);
+Q_STATIC_ASSERT(offsetof(EngineBase, currentStackFrame) == 0);
+Q_STATIC_ASSERT(offsetof(EngineBase, jsStackTop) == offsetof(EngineBase, currentStackFrame) + QT_POINTER_SIZE);
 Q_STATIC_ASSERT(offsetof(EngineBase, hasException) == offsetof(EngineBase, jsStackTop) + QT_POINTER_SIZE);
 Q_STATIC_ASSERT(offsetof(EngineBase, memoryManager) == offsetof(EngineBase, hasException) + QT_POINTER_SIZE);
 Q_STATIC_ASSERT(offsetof(EngineBase, runtime) == offsetof(EngineBase, memoryManager) + QT_POINTER_SIZE);