1 files changed, 62 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp
index 51a9b92967..1bd4329fe8 100644
--- a/src/qml/jsruntime/qv4function.cpp
+++ b/src/qml/jsruntime/qv4function.cpp
@@ -46,6 +46,7 @@
 #include "qv4lookup_p.h"
 #include <private/qv4mm_p.h>
 #include <private/qv4identifiertable_p.h>
+#include <private/qv4functiontable_p.h>
 #include <assembler/MacroAssemblerCodeRef.h>
 #include <private/qv4vme_moth_p.h>
 #include <private/qqmlglobal_p.h>
@@ -72,12 +73,29 @@ ReturnedValue Function::call(const Value *thisObject, const Value *argv, int arg
     return result;
 }
 
+Function *Function::create(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function)
+{
+    quint16 traceSlotCount = 0;
+#if QT_CONFIG(qml_tracing)
+        traceSlotCount = function->nTraceInfos == CompiledData::Function::NoTracing()
+                ? 1
+                : function->nTraceInfos;
+#endif
+    quint8 *storage = new quint8[sizeof(Function) + traceSlotCount];
+    return new(storage) Function(engine, unit, function);
+}
+
+void Function::destroy()
+{
+    delete[] reinterpret_cast<quint8 *>(this);
+}
+
 Function::Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function)
-    : compiledFunction(function)
-    , compilationUnit(unit)
+    : FunctionData(unit)
+    , compiledFunction(function)
     , codeData(function->code())
-        , jittedCode(nullptr)
-        , codeRef(nullptr)
+    , jittedCode(nullptr)
+    , codeRef(nullptr)
 {
     Scope scope(engine);
     Scoped<InternalClass> ic(scope, engine->internalClasses(EngineBase::Class_CallContext));
@@ -93,11 +111,21 @@ Function::Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit,
     internalClass = ic->d();
 
     nFormals = compiledFunction->nFormals;
+
+#if QT_CONFIG(qml_tracing)
+    if (tracingEnabled()) {
+        for (uint i = 0; i < function->nTraceInfos; ++i)
+            *traceInfo(i) = 0;
+    }
+#endif
 }
 
 Function::~Function()
 {
-    delete codeRef;
+    if (codeRef) {
+        destroyFunctionTable(this, codeRef);
+        delete codeRef;
+    }
 }
 
 void Function::updateInternalClass(ExecutionEngine *engine, const QList<QByteArray> &parameters)
@@ -144,9 +172,38 @@ void Function::updateInternalClass(ExecutionEngine *engine, const QList<QByteArr
     nFormals = parameters.size();
 }
 
+QString Function::prettyName(const Function *function, const void *code)
+{
+    QString prettyName = function ? function->name()->toQString() : QString();
+    if (prettyName.isEmpty()) {
+        prettyName = QString::number(reinterpret_cast<quintptr>(code), 16);
+        prettyName.prepend(QLatin1String("QV4::Function(0x"));
+        prettyName.append(QLatin1Char(')'));
+    }
+    return prettyName;
+}
+
 QQmlSourceLocation Function::sourceLocation() const
 {
     return QQmlSourceLocation(sourceFile(), compiledFunction->location.line, compiledFunction->location.column);
 }
 
+QString Function::traceInfoToString()
+{
+    QString info = QLatin1String("=== Trace information for ") + name()->toQString() + QLatin1Char(':');
+    if (!tracingEnabled())
+        return info + QStringLiteral(" disabled. Interpreter call count: %1\n").arg(interpreterCallCount);
+    if (compiledFunction->nTraceInfos == 0)
+        return info + QLatin1String(" none.\n");
+
+    info += QLatin1Char('\n');
+    for (uint i = 0, ei = compiledFunction->nTraceInfos; i < ei; ++i) {
+        auto bits = QString::number(*traceInfo(i), 2);
+        if (bits.size() < 8)
+            bits.prepend(QString(8 - bits.size(), '0'));
+        info += QStringLiteral("    %1: %2\n").arg(QString::number(i), bits);
+    }
+    return info;
+}
+
 QT_END_NAMESPACE