4 files changed, 9 insertions, 6 deletions
diff --git a/src/qml/compiler/qv4bytecodehandler.cpp b/src/qml/compiler/qv4bytecodehandler.cpp
index 92b112c2fa..f9f755b8c0 100644
--- a/src/qml/compiler/qv4bytecodehandler.cpp
+++ b/src/qml/compiler/qv4bytecodehandler.cpp
@@ -58,9 +58,10 @@ ByteCodeHandler::~ByteCodeHandler()
         Q_UNUSED(base_ptr); \
         _currentOffset = _nextOffset; \
         _nextOffset = code - start; \
-        startInstruction(Instr::Type::instr); \
-        INSTR_##instr(DISPATCH) \
-        endInstruction(Instr::Type::instr); \
+        if (startInstruction(Instr::Type::instr) == ProcessInstruction) { \
+            INSTR_##instr(DISPATCH) \
+            endInstruction(Instr::Type::instr); \
+        } \
         continue; \
     }
 
diff --git a/src/qml/compiler/qv4bytecodehandler_p.h b/src/qml/compiler/qv4bytecodehandler_p.h
index 797d25b8d0..f1e7c99447 100644
--- a/src/qml/compiler/qv4bytecodehandler_p.h
+++ b/src/qml/compiler/qv4bytecodehandler_p.h
@@ -105,7 +105,8 @@ public:
 protected:
     FOR_EACH_MOTH_INSTR(BYTECODE_HANDLER_DEFINE_VIRTUAL_BYTECODE_HANDLER)
 
-    virtual void startInstruction(Moth::Instr::Type instr) = 0;
+    enum Verdict { ProcessInstruction, SkipInstruction };
+    virtual Verdict startInstruction(Moth::Instr::Type instr) = 0;
     virtual void endInstruction(Moth::Instr::Type instr) = 0;
 
 private:
diff --git a/src/qml/jit/qv4baselinejit.cpp b/src/qml/jit/qv4baselinejit.cpp
index 8de0259509..b0734d0a2d 100644
--- a/src/qml/jit/qv4baselinejit.cpp
+++ b/src/qml/jit/qv4baselinejit.cpp
@@ -1023,10 +1023,11 @@ void BaselineJIT::generate_GetTemplateObject(int index)
     as->checkException();
 }
 
-void BaselineJIT::startInstruction(Instr::Type /*instr*/)
+ByteCodeHandler::Verdict BaselineJIT::startInstruction(Instr::Type /*instr*/)
 {
     if (labels.contains(currentInstructionOffset()))
         as->addLabel(currentInstructionOffset());
+    return ProcessInstruction;
 }
 
 void BaselineJIT::endInstruction(Instr::Type instr)
diff --git a/src/qml/jit/qv4baselinejit_p.h b/src/qml/jit/qv4baselinejit_p.h
index 998f9f110b..5f3cb7eb2e 100644
--- a/src/qml/jit/qv4baselinejit_p.h
+++ b/src/qml/jit/qv4baselinejit_p.h
@@ -217,7 +217,7 @@ public:
     void generate_ThrowOnNullOrUndefined() override;
     void generate_GetTemplateObject(int index) override;
 
-    void startInstruction(Moth::Instr::Type instr) override;
+    Verdict startInstruction(Moth::Instr::Type instr) override;
     void endInstruction(Moth::Instr::Type instr) override;
 
 private: