From 1c3e1df2536712c7c2aef4ec5f68316a7e32e4ff Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 17 Oct 2017 13:02:17 +0200 Subject: Move a couple of data members required for new JIT Mark CompilationUnit final and get rid of it's vtable. Fix initializations with 0 instead of nullptr. Change-Id: Ieec260bd45d8f08cf5d8964becd312b221cbb2a9 Reviewed-by: Ulf Hermann Reviewed-by: Erik Verbruggen --- src/qml/jsruntime/qv4enginebase_p.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/qml/jsruntime/qv4enginebase_p.h') diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h index 00049392af..e0f5f3ffb1 100644 --- a/src/qml/jsruntime/qv4enginebase_p.h +++ b/src/qml/jsruntime/qv4enginebase_p.h @@ -66,24 +66,27 @@ struct CppStackFrame; #endif struct Q_QML_EXPORT EngineBase { - CppStackFrame *currentStackFrame = 0; + 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 = 0; - Object *globalObject = 0; + IdentifierTable *identifierTable = nullptr; + Object *globalObject = nullptr; + + // Exception handling + Value *exceptionValue = nullptr; enum { Class_Empty, -- cgit v1.2.3