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

Change-Id: Ie2b9472ba925df6e6a74727d44d8179557072105

1 files changed, 2 insertions, 34 deletions

diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp
index 1bd4329fe8..debdf23d27 100644
--- a/src/qml/jsruntime/qv4function.cpp
+++ b/src/qml/jsruntime/qv4function.cpp
@@ -75,19 +75,12 @@ ReturnedValue Function::call(const Value *thisObject, const Value *argv, int arg
 
 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);
+    return new Function(engine, unit, function);
 }
 
 void Function::destroy()
 {
-    delete[] reinterpret_cast<quint8 *>(this);
+    delete this;
 }
 
 Function::Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function)
@@ -111,13 +104,6 @@ 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()
@@ -188,22 +174,4 @@ 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