1 files changed, 17 insertions, 47 deletions

diff --git a/src/qml/compiler/qv4bytecodegenerator_p.h b/src/qml/compiler/qv4bytecodegenerator_p.h
index 1d0a57c536..8c509dd9f1 100644
--- a/src/qml/compiler/qv4bytecodegenerator_p.h
+++ b/src/qml/compiler/qv4bytecodegenerator_p.h
@@ -62,12 +62,15 @@ class SourceLocation;
 }
 
 namespace QV4 {
+
+namespace Compiler {
+struct Context;
+}
+
 namespace Moth {
 
 class BytecodeGenerator {
 public:
-    typedef CompiledData::Function::TraceInfoCount TraceInfoCount;
-
     BytecodeGenerator(int line, bool debug)
         : startLine(line), debugMode(debug) {}
 
@@ -164,15 +167,6 @@ public:
         addInstructionHelper(Moth::Instr::Type(InstrT), genericInstr);
     }
 
-    // Same as addInstruction, but also add a trace slot. Move only, because the instruction cannot
-    // be reused afterwards.
-    template<int InstrT>
-    void addTracingInstruction(InstrData<InstrT> data)
-    {
-        data.traceSlot = nextTraceInfo();
-        addInstruction(data);
-    }
-
     Q_REQUIRED_RESULT Jump jump()
     {
 QT_WARNING_PUSH
@@ -184,12 +178,12 @@ QT_WARNING_POP
 
     Q_REQUIRED_RESULT Jump jumpTrue()
     {
-        return addTracingJumpInstruction(Instruction::JumpTrue());
+        return addJumpInstruction(Instruction::JumpTrue());
     }
 
     Q_REQUIRED_RESULT Jump jumpFalse()
     {
-        return addTracingJumpInstruction(Instruction::JumpFalse());
+        return addJumpInstruction(Instruction::JumpFalse());
     }
 
     Q_REQUIRED_RESULT Jump jumpNotUndefined()
@@ -209,7 +203,7 @@ QT_WARNING_POP
         Instruction::CmpStrictEqual cmp;
         cmp.lhs = lhs;
         addInstruction(std::move(cmp));
-        addTracingJumpInstruction(Instruction::JumpTrue()).link(target);
+        addJumpInstruction(Instruction::JumpTrue()).link(target);
     }
 
     void jumpStrictNotEqual(const StackSlot &lhs, const Label &target)
@@ -217,7 +211,13 @@ QT_WARNING_POP
         Instruction::CmpStrictNotEqual cmp;
         cmp.lhs = lhs;
         addInstruction(std::move(cmp));
-        addTracingJumpInstruction(Instruction::JumpTrue()).link(target);
+        addJumpInstruction(Instruction::JumpTrue()).link(target);
+    }
+
+    void checkException()
+    {
+        Instruction::CheckException chk;
+        addInstruction(chk);
     }
 
     void setUnwindHandler(ExceptionHandler *handler)
@@ -258,13 +258,6 @@ QT_WARNING_POP
     void finalize(Compiler::Context *context);
 
     template<int InstrT>
-    Jump addTracingJumpInstruction(InstrData<InstrT> &&data)
-    {
-        data.traceSlot = nextTraceInfo();
-        return addJumpInstruction(data);
-    }
-
-    template<int InstrT>
     Jump addJumpInstruction(const InstrData<InstrT> &data)
     {
         Instr genericInstr;
@@ -275,9 +268,9 @@ QT_WARNING_POP
     void addCJumpInstruction(bool jumpOnFalse, const Label *trueLabel, const Label *falseLabel)
     {
         if (jumpOnFalse)
-            addTracingJumpInstruction(Instruction::JumpFalse()).link(*falseLabel);
+            addJumpInstruction(Instruction::JumpFalse()).link(*falseLabel);
         else
-            addTracingJumpInstruction(Instruction::JumpTrue()).link(*trueLabel);
+            addJumpInstruction(Instruction::JumpTrue()).link(*trueLabel);
     }
 
     void clearLastInstruction()
@@ -285,27 +278,6 @@ QT_WARNING_POP
         lastInstrType = -1;
     }
 
-    TraceInfoCount nextTraceInfo()
-    {
-        // If tracing is disabled, use slot 0 to unconditionally store all trace info
-        if (nTraceInfos == CompiledData::Function::NoTracing())
-            return TraceInfoCount(0);
-        return nTraceInfos++;
-    }
-
-    void setTracing(bool onoff, int argumentCount)
-    {
-        if (onoff)
-            nTraceInfos = argumentCount;
-        else
-            nTraceInfos = CompiledData::Function::NoTracing();
-    }
-
-    TraceInfoCount traceInfoCount() const
-    {
-        return nTraceInfos;
-    }
-
     void addLoopStart(const Label &start)
     {
         _labelInfos.push_back({ start.index });
@@ -346,8 +318,6 @@ private:
     int lastInstrType = -1;
     Moth::Instr lastInstr;
 
-    TraceInfoCount nTraceInfos = TraceInfoCount(0);
-
     struct LabelInfo {
         int labelIndex;
     };