Merge "Merge remote-tracking branch 'origin/dev' into wip/scenegraphng"wip/scenegraphng

1 files changed, 25 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h
index 01b212370d..cbbb61c68c 100644
--- a/src/qml/jsruntime/qv4function_p.h
+++ b/src/qml/jsruntime/qv4function_p.h
@@ -51,7 +51,7 @@
 //
 
 #include "qv4global_p.h"
-#include <private/qv4compileddata_p.h>
+#include <private/qv4executablecompilationunit_p.h>
 #include <private/qv4context_p.h>
 
 namespace JSC {
@@ -65,9 +65,13 @@ struct QQmlSourceLocation;
 namespace QV4 {
 
 struct Q_QML_EXPORT FunctionData {
-    CompiledData::CompilationUnit *compilationUnit;
+    CompiledData::CompilationUnitBase *compilationUnit;
 
-    FunctionData(CompiledData::CompilationUnit *compilationUnit)
+    // Intentionally require an ExecutableCompilationUnit but save only a pointer to
+    // CompilationUnitBase. This is so that we can take advantage of the standard layout
+    // of CompilationUnitBase in the JIT. Furthermore we can safely static_cast to
+    // ExecutableCompilationUnit where we need it.
+    FunctionData(ExecutableCompilationUnit *compilationUnit)
         : compilationUnit(compilationUnit)
     {}
 };
@@ -76,12 +80,24 @@ Q_STATIC_ASSERT(std::is_standard_layout< FunctionData >::value);
 
 struct Q_QML_EXPORT Function : public FunctionData {
 private:
-    Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function);
+    Function(ExecutionEngine *engine, ExecutableCompilationUnit *unit,
+             const CompiledData::Function *function);
     ~Function();
 
 public:
     const CompiledData::Function *compiledFunction;
 
+    QV4::ExecutableCompilationUnit *executableCompilationUnit() const
+    {
+        // This is safe: We require an ExecutableCompilationUnit in the ctor.
+        return static_cast<QV4::ExecutableCompilationUnit *>(compilationUnit);
+    }
+
+    QV4::Heap::String *runtimeString(uint i)
+    {
+        return compilationUnit->runtimeStrings[i];
+    }
+
     ReturnedValue call(const Value *thisObject, const Value *argv, int argc, const ExecutionContext *context);
 
     const char *codeData;
@@ -96,7 +112,8 @@ public:
     int interpreterCallCount = 0;
     bool isEval = false;
 
-    static Function *create(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function);
+    static Function *create(ExecutionEngine *engine, ExecutableCompilationUnit *unit,
+                            const CompiledData::Function *function);
     void destroy();
 
     // used when dynamically assigning signal handlers (QQmlConnection)
@@ -108,8 +125,8 @@ public:
 
     static QString prettyName(const Function *function, const void *address);
 
-    inline QString sourceFile() const { return compilationUnit->fileName(); }
-    inline QUrl finalUrl() const { return compilationUnit->finalUrl(); }
+    inline QString sourceFile() const { return executableCompilationUnit()->fileName(); }
+    inline QUrl finalUrl() const { return executableCompilationUnit()->finalUrl(); }
 
     inline bool isStrict() const { return compiledFunction->flags & CompiledData::Function::IsStrict; }
     inline bool isArrowFunction() const { return compiledFunction->flags & CompiledData::Function::IsArrowFunction; }
@@ -121,7 +138,7 @@ public:
     {
         if (compiledFunction->nestedFunctionIndex == std::numeric_limits<uint32_t>::max())
             return nullptr;
-        return compilationUnit->runtimeFunctions[compiledFunction->nestedFunctionIndex];
+        return executableCompilationUnit()->runtimeFunctions[compiledFunction->nestedFunctionIndex];
     }
 };