1 files changed, 47 insertions, 5 deletions

diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h
index 029dd7786b..374e46b929 100644
--- a/src/qml/jsruntime/qv4function_p.h
+++ b/src/qml/jsruntime/qv4function_p.h
@@ -64,10 +64,24 @@ struct QQmlSourceLocation;
 
 namespace QV4 {
 
-struct Q_QML_EXPORT Function {
-    const CompiledData::Function *compiledFunction;
+struct Q_QML_EXPORT FunctionData {
     CompiledData::CompilationUnit *compilationUnit;
 
+    FunctionData(CompiledData::CompilationUnit *compilationUnit)
+        : compilationUnit(compilationUnit)
+    {}
+};
+// Make sure this class can be accessed through offsetof (done by the assemblers):
+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();
+
+public:
+    const CompiledData::Function *compiledFunction;
+
     ReturnedValue call(const Value *thisObject, const Value *argv, int argc, const ExecutionContext *context);
 
     const char *codeData;
@@ -83,15 +97,18 @@ struct Q_QML_EXPORT Function {
     bool hasQmlDependencies;
     bool isEval = false;
 
-    Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function);
-    ~Function();
+    static Function *create(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function);
+    void destroy();
 
     // used when dynamically assigning signal handlers (QQmlConnection)
     void updateInternalClass(ExecutionEngine *engine, const QList<QByteArray> &parameters);
 
-    inline Heap::String *name() {
+    inline Heap::String *name() const {
         return compilationUnit->runtimeStrings[compiledFunction->nameIndex];
     }
+
+    static QString prettyName(const Function *function, const void *address);
+
     inline QString sourceFile() const { return compilationUnit->fileName(); }
     inline QUrl finalUrl() const { return compilationUnit->finalUrl(); }
 
@@ -107,6 +124,31 @@ struct Q_QML_EXPORT Function {
             return nullptr;
         return compilationUnit->runtimeFunctions[compiledFunction->nestedFunctionIndex];
     }
+
+    Q_NEVER_INLINE QString traceInfoToString();
+
+    quint8 *traceInfo(uint i)
+    {
+#if QT_CONFIG(qml_tracing)
+        Q_ASSERT((tracingEnabled() && i < traceInfoCount()) || (i == 0));
+        return reinterpret_cast<quint8 *>(this) + sizeof(Function) + i;
+#else
+        Q_UNUSED(i);
+        return nullptr;
+#endif
+    }
+
+    quint32 traceInfoCount() const
+    { return compiledFunction->nTraceInfos; }
+
+    bool tracingEnabled() const
+    {
+#if QT_CONFIG(qml_tracing)
+        return traceInfoCount() != CompiledData::Function::NoTracing();
+#else
+        return false;
+#endif
+    }
 };
 
 }