Remove tracing JIT infrastructure

The tracing JIT won't be finished. Therefore, remove the parts that have
already been integrated.

Change-Id: If72036be904bd7fc17ba9bcba0a317f8ed6cb30d
Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>

9 files changed, 18 insertions, 323 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index f374a092b7..a0b11c2c51 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -138,8 +138,6 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_LOGGING_CATEGORY(lcTracingAll, "qt.v4.tracing.all")
-
 using namespace QV4;
 
 #ifndef V4_BOOTSTRAP
@@ -658,13 +656,6 @@ ExecutionEngine::ExecutionEngine(QJSEngine *jsEngine)
 
 ExecutionEngine::~ExecutionEngine()
 {
-    if (Q_UNLIKELY(lcTracingAll().isDebugEnabled())) {
-        for (auto cu : compilationUnits) {
-            for (auto f : qAsConst(cu->runtimeFunctions))
-                qCDebug(lcTracingAll).noquote().nospace() << f->traceInfoToString();
-        }
-    }
-
     modules.clear();
     delete m_multiplyWrappedQObjects;
     m_multiplyWrappedQObjects = nullptr;
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
diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h
index f8125a58f8..01b212370d 100644
--- a/src/qml/jsruntime/qv4function_p.h
+++ b/src/qml/jsruntime/qv4function_p.h
@@ -123,31 +123,6 @@ public:
             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
-    }
 };
 
 }
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
index 8a0ef5aa30..42b6edb6e2 100644
--- a/src/qml/jsruntime/qv4global_p.h
+++ b/src/qml/jsruntime/qv4global_p.h
@@ -236,20 +236,6 @@ struct IdentifierTable;
 class RegExpCache;
 class MultiplyWrappedQObjectMap;
 
-enum class ObservedTraceValues : quint8 {
-    Integer = 1 << 0,
-    Boolean = 1 << 1,
-    Double  = 1 << 2,
-    Other   = 1 << 3,
-    TypeMask = Integer | Boolean | Double | Other,
-
-    TruePathTaken  = 1 << 0,
-    FalsePathTaken = 1 << 1,
-
-    ArrayWasAccessed          = 1 << 7,
-    ArrayAccessNeededFallback = 1 << 6,
-};
-
 enum PropertyFlag {
     Attr_Data = 0,
     Attr_Accessor = 0x1,
diff --git a/src/qml/jsruntime/qv4math_p.h b/src/qml/jsruntime/qv4math_p.h
index a60a49a811..90246c4229 100644
--- a/src/qml/jsruntime/qv4math_p.h
+++ b/src/qml/jsruntime/qv4math_p.h
@@ -66,42 +66,27 @@ QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
-static inline QMLJS_READONLY ReturnedValue add_int32(int a, int b, quint8 *traceInfo = nullptr)
+static inline QMLJS_READONLY ReturnedValue add_int32(int a, int b)
 {
     int result;
-    if (Q_UNLIKELY(add_overflow(a, b, &result))) {
-        if (traceInfo)
-            *traceInfo |= quint8(QV4::ObservedTraceValues::Double);
+    if (Q_UNLIKELY(add_overflow(a, b, &result)))
         return Value::fromDouble(static_cast<double>(a) + b).asReturnedValue();
-    }
-    if (traceInfo)
-        *traceInfo |= quint8(QV4::ObservedTraceValues::Integer);
     return Value::fromInt32(result).asReturnedValue();
 }
 
-static inline QMLJS_READONLY ReturnedValue sub_int32(int a, int b, quint8 *traceInfo = nullptr)
+static inline QMLJS_READONLY ReturnedValue sub_int32(int a, int b)
 {
     int result;
-    if (Q_UNLIKELY(sub_overflow(a, b, &result))) {
-        if (traceInfo)
-            *traceInfo |= quint8(QV4::ObservedTraceValues::Double);
+    if (Q_UNLIKELY(sub_overflow(a, b, &result)))
         return Value::fromDouble(static_cast<double>(a) - b).asReturnedValue();
-    }
-    if (traceInfo)
-        *traceInfo |= quint8(QV4::ObservedTraceValues::Integer);
     return Value::fromInt32(result).asReturnedValue();
 }
 
-static inline QMLJS_READONLY ReturnedValue mul_int32(int a, int b, quint8 *traceInfo = nullptr)
+static inline QMLJS_READONLY ReturnedValue mul_int32(int a, int b)
 {
     int result;
-    if (Q_UNLIKELY(mul_overflow(a, b, &result))) {
-        if (traceInfo)
-            *traceInfo |= quint8(QV4::ObservedTraceValues::Double);
+    if (Q_UNLIKELY(mul_overflow(a, b, &result)))
         return Value::fromDouble(static_cast<double>(a) * b).asReturnedValue();
-    }
-    if (traceInfo)
-        *traceInfo |= quint8(QV4::ObservedTraceValues::Integer);
     return Value::fromInt32(result).asReturnedValue();
 }
 
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index 8f2b162106..e95dfa775f 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -717,30 +717,6 @@ ReturnedValue Runtime::LoadElement::call(ExecutionEngine *engine, const Value &o
     return getElementFallback(engine, object, index);
 }
 
-ReturnedValue Runtime::LoadElement_Traced::call(ExecutionEngine *engine, const Value &object, const Value &index, quint8 *traceSlot)
-{
-    *traceSlot |= quint8(ObservedTraceValues::ArrayWasAccessed);
-    if (index.isPositiveInt()) {
-        uint idx = static_cast<uint>(index.int_32());
-        if (Heap::Base *b = object.heapObject()) {
-            if (b->internalClass->vtable->isObject) {
-                Heap::Object *o = static_cast<Heap::Object *>(b);
-                if (o->arrayData && o->arrayData->type == Heap::ArrayData::Simple) {
-                    Heap::SimpleArrayData *s = o->arrayData.cast<Heap::SimpleArrayData>();
-                    if (idx < s->values.size)
-                        if (!s->data(idx).isEmpty())
-                            return s->data(idx).asReturnedValue();
-                }
-            }
-        }
-        *traceSlot |= quint8(ObservedTraceValues::ArrayAccessNeededFallback);
-        return getElementIntFallback(engine, object, idx);
-    }
-
-    *traceSlot |= quint8(ObservedTraceValues::ArrayAccessNeededFallback);
-    return getElementFallback(engine, object, index);
-}
-
 static Q_NEVER_INLINE bool setElementFallback(ExecutionEngine *engine, const Value &object, const Value &index, const Value &value)
 {
     Scope scope(engine);
@@ -796,30 +772,6 @@ void Runtime::StoreElement::call(ExecutionEngine *engine, const Value &object, c
         engine->throwTypeError();
 }
 
-void Runtime::StoreElement_traced::call(ExecutionEngine *engine, const Value &object, const Value &index, const Value &value, quint8 *traceSlot)
-{
-    *traceSlot |= quint8(ObservedTraceValues::ArrayWasAccessed);
-    if (index.isPositiveInt()) {
-        uint idx = static_cast<uint>(index.int_32());
-        if (Heap::Base *b = object.heapObject()) {
-            if (b->internalClass->vtable->isObject) {
-                Heap::Object *o = static_cast<Heap::Object *>(b);
-                if (o->arrayData && o->arrayData->type == Heap::ArrayData::Simple) {
-                    Heap::SimpleArrayData *s = o->arrayData.cast<Heap::SimpleArrayData>();
-                    if (idx < s->values.size) {
-                        s->setData(engine, idx, value);
-                        return;
-                    }
-                }
-            }
-        }
-    }
-
-    *traceSlot |= quint8(ObservedTraceValues::ArrayAccessNeededFallback);
-    if (!setElementFallback(engine, object, index, value) && engine->currentStackFrame->v4Function->isStrict())
-        engine->throwTypeError();
-}
-
 ReturnedValue Runtime::GetIterator::call(ExecutionEngine *engine, const Value &in, int iterator)
 {
     Scope scope(engine);
diff --git a/src/qml/jsruntime/qv4runtimeapi_p.h b/src/qml/jsruntime/qv4runtimeapi_p.h
index 86cbccde23..13a73b7046 100644
--- a/src/qml/jsruntime/qv4runtimeapi_p.h
+++ b/src/qml/jsruntime/qv4runtimeapi_p.h
@@ -154,10 +154,6 @@ struct Q_QML_PRIVATE_EXPORT Runtime {
     {
         static void call(ExecutionEngine *, const Value &, const Value &, const Value &);
     };
-    struct Q_QML_PRIVATE_EXPORT StoreElement_traced : Method<Throws::Yes>
-    {
-        static void call(ExecutionEngine *, const Value &, const Value &, const Value &, quint8 *);
-    };
     struct Q_QML_PRIVATE_EXPORT LoadProperty : Method<Throws::Yes>
     {
         static ReturnedValue call(ExecutionEngine *, const Value &, int);
@@ -170,10 +166,6 @@ struct Q_QML_PRIVATE_EXPORT Runtime {
     {
         static ReturnedValue call(ExecutionEngine *, const Value &, const Value &);
     };
-    struct Q_QML_PRIVATE_EXPORT LoadElement_Traced : Method<Throws::Yes>
-    {
-        static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, quint8 *);
-    };
     struct Q_QML_PRIVATE_EXPORT LoadSuperProperty : Method<Throws::Yes>
     {
         static ReturnedValue call(ExecutionEngine *, const Value &);
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index 71e35bdc07..4c292d429a 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -350,82 +350,6 @@ static struct InstrCount {
     if (engine->hasException) \
         goto handleUnwind
 
-static inline void traceJumpTakesTruePath(bool truePathTaken, Function *f, int slot)
-{
-#if QT_CONFIG(qml_tracing)
-    quint8 *traceInfo = f->traceInfo(slot);
-    Q_ASSERT(traceInfo);
-    *traceInfo |= truePathTaken ? quint8(ObservedTraceValues::TruePathTaken)
-                                : quint8(ObservedTraceValues::FalsePathTaken);
-#else
-    Q_UNUSED(truePathTaken);
-    Q_UNUSED(f);
-    Q_UNUSED(slot);
-#endif
-}
-
-static inline void traceValue(ReturnedValue acc, Function *f, int slot)
-{
-#if QT_CONFIG(qml_tracing)
-    quint8 *traceInfo = f->traceInfo(slot);
-    Q_ASSERT(traceInfo);
-    switch (Primitive::fromReturnedValue(acc).type()) {
-    case QV4::Value::Integer_Type:
-        *traceInfo |= quint8(ObservedTraceValues::Integer);
-        break;
-    case QV4::Value::Boolean_Type:
-        *traceInfo |= quint8(ObservedTraceValues::Boolean);
-        break;
-    case QV4::Value::Double_Type:
-        *traceInfo |= quint8(ObservedTraceValues::Double);
-        break;
-    default:
-        *traceInfo |= quint8(ObservedTraceValues::Other);
-        break;
-    }
-#else
-    Q_UNUSED(acc);
-    Q_UNUSED(f);
-    Q_UNUSED(slot);
-#endif
-}
-
-static inline void traceIntValue(Function *f, int slot)
-{
-#if QT_CONFIG(qml_tracing)
-    quint8 *traceInfo = f->traceInfo(slot);
-    Q_ASSERT(traceInfo);
-    *traceInfo |= quint8(ObservedTraceValues::Integer);
-#else
-    Q_UNUSED(f);
-    Q_UNUSED(slot);
-#endif
-}
-
-static inline void traceDoubleValue(Function *f, int slot)
-{
-#if QT_CONFIG(qml_tracing)
-    quint8 *traceInfo = f->traceInfo(slot);
-    Q_ASSERT(traceInfo);
-    *traceInfo |= quint8(ObservedTraceValues::Double);
-#else
-    Q_UNUSED(f);
-    Q_UNUSED(slot);
-#endif
-}
-
-static inline void traceOtherValue(Function *f, int slot)
-{
-#if QT_CONFIG(qml_tracing)
-    quint8 *traceInfo = f->traceInfo(slot);
-    Q_ASSERT(traceInfo);
-    *traceInfo |= quint8(ObservedTraceValues::Other);
-#else
-    Q_UNUSED(f);
-    Q_UNUSED(slot);
-#endif
-}
-
 static inline Heap::CallContext *getScope(QV4::Value *stack, int level)
 {
     Heap::ExecutionContext *scope = static_cast<ExecutionContext &>(stack[CallData::Context]).d();
@@ -504,16 +428,10 @@ ReturnedValue VME::exec(CppStackFrame *frame, ExecutionEngine *engine)
 #if QT_CONFIG(qml_jit)
     if (debugger == nullptr) {
         if (function->jittedCode == nullptr) {
-            if (engine->canJIT(function)) {
-#if QT_CONFIG(qml_tracing)
-                if (function->tracingEnabled())
-                    runTracingJit(function);
-                else
-#endif
-                    QV4::JIT::BaselineJIT(function).generate();
-            } else {
+            if (engine->canJIT(function))
+                QV4::JIT::BaselineJIT(function).generate();
+            else
                 ++function->interpreterCallCount;
-            }
         }
     }
 #endif // QT_CONFIG(qml_jit)
@@ -525,22 +443,6 @@ ReturnedValue VME::exec(CppStackFrame *frame, ExecutionEngine *engine)
     ReturnedValue result;
     if (function->jittedCode != nullptr && debugger == nullptr) {
         result = function->jittedCode(frame, engine);
-        if (QV4::Value::fromReturnedValue(result).isEmpty()) { // de-optimize!
-            if (ShowWhenDeoptimiationHappens) {
-                // This is debug code, which is disabled by default, and completely removed by the
-                // compiler.
-                fprintf(stderr, "*********************** DEOPT! %s ***********************\n"
-                                "*** deopt IP: %d, line: %d\n",
-                        function->name()->toQString().toUtf8().constData(),
-                        frame->instructionPointer,
-                        frame->lineNumber());
-            }
-            delete function->codeRef;
-            function->codeRef = nullptr;
-            function->jittedCode = nullptr;
-            function->interpreterCallCount = 0; // reset to restart tracing: apparently we didn't have enough info before
-            result = interpret(frame, engine, function->codeData + frame->instructionPointer);
-        }
     } else {
         // interpreter
         result = interpret(frame, engine, function->codeData);
@@ -559,11 +461,6 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
     QV4::ReturnedValue acc = accumulator.asReturnedValue();
     Value *stack = reinterpret_cast<Value *>(frame->jsFrame);
 
-    if (function->tracingEnabled()) {
-        for (int i = 0; i < int(function->nFormals); ++i)
-            traceValue(frame->jsFrame->argument(i), function, i);
-    }
-
     MOTH_JUMP_TABLE;
 
     for (;;) {
@@ -622,7 +519,6 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
         auto cc = static_cast<Heap::CallContext *>(stack[CallData::Context].m());
         Q_ASSERT(cc->type != QV4::Heap::CallContext::Type_GlobalContext);
         acc = cc->locals[index].asReturnedValue();
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(LoadLocal)
 
     MOTH_BEGIN_INSTR(StoreLocal)
@@ -635,7 +531,6 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
     MOTH_BEGIN_INSTR(LoadScopedLocal)
         auto cc = getScope(stack, scope);
         acc = cc->locals[index].asReturnedValue();
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(LoadScopedLocal)
 
     MOTH_BEGIN_INSTR(StoreScopedLocal)
@@ -660,7 +555,6 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
         STORE_IP();
         acc = Runtime::LoadName::call(engine, name);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(LoadName)
 
     MOTH_BEGIN_INSTR(LoadGlobalLookup)
@@ -668,7 +562,6 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
         QV4::Lookup *l = function->compilationUnit->runtimeLookups + index;
         acc = l->globalGetter(l, engine);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(LoadGlobalLookup)
 
     MOTH_BEGIN_INSTR(LoadQmlContextPropertyLookup)
@@ -676,7 +569,6 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
         QV4::Lookup *l = function->compilationUnit->runtimeLookups + index;
         acc = l->qmlContextPropertyGetter(l, engine, nullptr);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(LoadQmlContextPropertyLookup)
 
     MOTH_BEGIN_INSTR(StoreNameStrict)
@@ -696,25 +588,14 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
     MOTH_BEGIN_INSTR(LoadElement)
         STORE_IP();
         STORE_ACC();
-#if QT_CONFIG(qml_tracing)
-        acc = Runtime::LoadElement_Traced::call(engine, STACK_VALUE(base), accumulator, function->traceInfo(traceSlot));
-        traceValue(acc, function, traceSlot);
-#else
-        Q_UNUSED(traceSlot);
         acc = Runtime::LoadElement::call(engine, STACK_VALUE(base), accumulator);
-#endif
         CHECK_EXCEPTION;
     MOTH_END_INSTR(LoadElement)
 
     MOTH_BEGIN_INSTR(StoreElement)
         STORE_IP();
         STORE_ACC();
-#if QT_CONFIG(qml_tracing)
-        Runtime::StoreElement_traced::call(engine, STACK_VALUE(base), STACK_VALUE(index), accumulator, function->traceInfo(traceSlot));
-#else
-        Q_UNUSED(traceSlot);
         Runtime::StoreElement::call(engine, STACK_VALUE(base), STACK_VALUE(index), accumulator);
-#endif
         CHECK_EXCEPTION;
     MOTH_END_INSTR(StoreElement)
 
@@ -723,7 +604,6 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
         STORE_ACC();
         acc = Runtime::LoadProperty::call(engine, accumulator, name);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(LoadProperty)
 
     MOTH_BEGIN_INSTR(GetLookup)
@@ -742,7 +622,6 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
 
         acc = l->getter(l, engine, accumulator);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(GetLookup)
 
     MOTH_BEGIN_INSTR(StoreProperty)
@@ -816,7 +695,6 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
         Value undef = Value::undefinedValue();
         acc = static_cast<const FunctionObject &>(func).call(&undef, stack + argv, argc);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(CallValue)
 
     MOTH_BEGIN_INSTR(CallWithReceiver)
@@ -828,14 +706,12 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
         }
         acc = static_cast<const FunctionObject &>(func).call(stack + thisObject, stack + argv, argc);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(CallWithReceiver)
 
     MOTH_BEGIN_INSTR(CallProperty)
         STORE_IP();
         acc = Runtime::CallProperty::call(engine, stack[base], name, stack + argv, argc);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(CallProperty)
 
     MOTH_BEGIN_INSTR(CallPropertyLookup)
@@ -863,49 +739,42 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
 
         acc = static_cast<FunctionObject &>(f).call(stack + base, stack + argv, argc);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(CallPropertyLookup)
 
     MOTH_BEGIN_INSTR(CallElement)
         STORE_IP();
         acc = Runtime::CallElement::call(engine, stack[base], STACK_VALUE(index), stack + argv, argc);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(CallElement)
 
     MOTH_BEGIN_INSTR(CallName)
         STORE_IP();
         acc = Runtime::CallName::call(engine, name, stack + argv, argc);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(CallName)
 
     MOTH_BEGIN_INSTR(CallPossiblyDirectEval)
         STORE_IP();
         acc = Runtime::CallPossiblyDirectEval::call(engine, stack + argv, argc);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(CallPossiblyDirectEval)
 
     MOTH_BEGIN_INSTR(CallGlobalLookup)
         STORE_IP();
         acc = Runtime::CallGlobalLookup::call(engine, index, stack + argv, argc);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(CallGlobalLookup)
 
     MOTH_BEGIN_INSTR(CallQmlContextPropertyLookup)
         STORE_IP();
         acc = Runtime::CallQmlContextPropertyLookup::call(engine, index, stack + argv, argc);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(CallQmlContextPropertyLookup)
 
     MOTH_BEGIN_INSTR(CallWithSpread)
         STORE_IP();
         acc = Runtime::CallWithSpread::call(engine, STACK_VALUE(func), STACK_VALUE(thisObject), stack + argv, argc);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(CallWithSpread)
 
     MOTH_BEGIN_INSTR(TailCall)
@@ -1120,7 +989,6 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
             takeJump = ACC.int_32();
         else
             takeJump = ACC.toBoolean();
-        traceJumpTakesTruePath(takeJump, function, traceSlot);
         if (takeJump)
             code += offset;
     MOTH_END_INSTR(JumpTrue)
@@ -1131,7 +999,6 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
             takeJump = !ACC.int_32();
         else
             takeJump = !ACC.toBoolean();
-        traceJumpTakesTruePath(!takeJump, function, traceSlot);
         if (takeJump)
             code += offset;
     MOTH_END_INSTR(JumpFalse)
@@ -1291,12 +1158,7 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
     MOTH_END_INSTR(UNot)
 
     MOTH_BEGIN_INSTR(UPlus)
-        if (Q_LIKELY(ACC.isNumber())) {
-            if (ACC.isDouble())
-                traceDoubleValue(function, traceSlot);
-            else
-                traceIntValue(function, traceSlot);
-        } else {
+        if (Q_UNLIKELY(!ACC.isNumber())) {
             acc = Encode(ACC.toNumberImpl());
             CHECK_EXCEPTION;
         }
@@ -1307,17 +1169,14 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
             int a = ACC.int_32();
             if (a == 0 || a == std::numeric_limits<int>::min()) {
                 acc = Encode(-static_cast<double>(a));
-                traceDoubleValue(function, traceSlot);
             } else {
-                acc = sub_int32(0, ACC.int_32(), function->traceInfo(traceSlot));
+                acc = sub_int32(0, ACC.int_32());
             }
         } else if (ACC.isDouble()) {
             acc ^= (1ull << 63); // simply flip sign bit
-            traceDoubleValue(function, traceSlot);
         } else {
             acc = Encode(-ACC.toNumberImpl());
             CHECK_EXCEPTION;
-            traceOtherValue(function, traceSlot);
         }
     MOTH_END_INSTR(UMinus)
 
@@ -1328,57 +1187,49 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
 
     MOTH_BEGIN_INSTR(Increment)
         if (Q_LIKELY(ACC.integerCompatible())) {
-            acc = add_int32(ACC.int_32(), 1, function->traceInfo(traceSlot));
+            acc = add_int32(ACC.int_32(), 1);
         } else if (ACC.isDouble()) {
             acc = QV4::Encode(ACC.doubleValue() + 1.);
-            traceDoubleValue(function, traceSlot);
         } else {
             acc = Encode(ACC.toNumberImpl() + 1.);
             CHECK_EXCEPTION;
-            traceDoubleValue(function, traceSlot);
         }
     MOTH_END_INSTR(Increment)
 
     MOTH_BEGIN_INSTR(Decrement)
         if (Q_LIKELY(ACC.integerCompatible())) {
-            acc = sub_int32(ACC.int_32(), 1, function->traceInfo(traceSlot));
+            acc = sub_int32(ACC.int_32(), 1);
         } else if (ACC.isDouble()) {
             acc = QV4::Encode(ACC.doubleValue() - 1.);
-            traceDoubleValue(function, traceSlot);
         } else {
             acc = Encode(ACC.toNumberImpl() - 1.);
             CHECK_EXCEPTION;
-            traceDoubleValue(function, traceSlot);
         }
     MOTH_END_INSTR(Decrement)
 
     MOTH_BEGIN_INSTR(Add)
         const Value left = STACK_VALUE(lhs);
         if (Q_LIKELY(Value::integerCompatible(left, ACC))) {
-            acc = add_int32(left.int_32(), ACC.int_32(), function->traceInfo(traceSlot));
+            acc = add_int32(left.int_32(), ACC.int_32());
         } else if (left.isNumber() && ACC.isNumber()) {
             acc = Encode(left.asDouble() + ACC.asDouble());
-            traceDoubleValue(function, traceSlot);
         } else {
             STORE_ACC();
             acc = Runtime::Add::call(engine, left, accumulator);
             CHECK_EXCEPTION;
-            traceOtherValue(function, traceSlot);
         }
     MOTH_END_INSTR(Add)
 
     MOTH_BEGIN_INSTR(Sub)
         const Value left = STACK_VALUE(lhs);
         if (Q_LIKELY(Value::integerCompatible(left, ACC))) {
-            acc = sub_int32(left.int_32(), ACC.int_32(), function->traceInfo(traceSlot));
+            acc = sub_int32(left.int_32(), ACC.int_32());
         } else if (left.isNumber() && ACC.isNumber()) {
             acc = Encode(left.asDouble() - ACC.asDouble());
-            traceDoubleValue(function, traceSlot);
         } else {
             STORE_ACC();
             acc = Runtime::Sub::call(left, accumulator);
             CHECK_EXCEPTION;
-            traceOtherValue(function, traceSlot);
         }
     MOTH_END_INSTR(Sub)
 
@@ -1395,15 +1246,13 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
     MOTH_BEGIN_INSTR(Mul)
         const Value left = STACK_VALUE(lhs);
         if (Q_LIKELY(Value::integerCompatible(left, ACC))) {
-            acc = mul_int32(left.int_32(), ACC.int_32(), function->traceInfo(traceSlot));
+            acc = mul_int32(left.int_32(), ACC.int_32());
         } else if (left.isNumber() && ACC.isNumber()) {
             acc = Encode(left.asDouble() * ACC.asDouble());
-            traceDoubleValue(function, traceSlot);
         } else {
             STORE_ACC();
             acc = Runtime::Mul::call(left, accumulator);
             CHECK_EXCEPTION;
-            traceOtherValue(function, traceSlot);
         }
     MOTH_END_INSTR(Mul)
 
@@ -1417,7 +1266,6 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine,
         STORE_ACC();
         acc = Runtime::Mod::call(STACK_VALUE(lhs), accumulator);
         CHECK_EXCEPTION;
-        traceValue(acc, function, traceSlot);
     MOTH_END_INSTR(Mod)
 
     MOTH_BEGIN_INSTR(BitAnd)
diff --git a/src/qml/jsruntime/qv4vme_moth_p.h b/src/qml/jsruntime/qv4vme_moth_p.h
index 4ac7120d36..8a76e60f20 100644
--- a/src/qml/jsruntime/qv4vme_moth_p.h
+++ b/src/qml/jsruntime/qv4vme_moth_p.h
@@ -58,8 +58,6 @@ QT_BEGIN_NAMESPACE
 namespace QV4 {
 namespace Moth {
 
-void runTracingJit(QV4::Function *function);
-
 class VME
 {
 public: