Fix build without QML debugging

Change-Id: Ie1b18dd00705b1913572b87c6968a63438e7a90c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

5 files changed, 8 insertions, 11 deletions

diff --git a/src/qml/compiler/qv4bytecodegenerator.cpp b/src/qml/compiler/qv4bytecodegenerator.cpp
index efa4b36f05..96d6f78eae 100644
--- a/src/qml/compiler/qv4bytecodegenerator.cpp
+++ b/src/qml/compiler/qv4bytecodegenerator.cpp
@@ -185,6 +185,7 @@ void BytecodeGenerator::finalize(Compiler::Context *context)
 }
 
 int BytecodeGenerator::addInstructionHelper(Instr::Type type, const Instr &i, int offsetOfOffset) {
+#if QT_CONFIG(qml_debug)
     if (debugMode && type != Instr::Type::Debug) {
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Wmaybe-uninitialized") // broken gcc warns about Instruction::Debug()
@@ -197,6 +198,7 @@ QT_WARNING_DISABLE_GCC("-Wmaybe-uninitialized") // broken gcc warns about Instru
         }
 QT_WARNING_POP
     }
+#endif
 
     const int pos = instructions.size();
 
diff --git a/src/qml/compiler/qv4instr_moth.cpp b/src/qml/compiler/qv4instr_moth.cpp
index fbc6902f3d..3a81aca7f6 100644
--- a/src/qml/compiler/qv4instr_moth.cpp
+++ b/src/qml/compiler/qv4instr_moth.cpp
@@ -616,10 +616,8 @@ void dumpBytecode(const char *code, int len, int nLocals, int nFormals, int /*st
         MOTH_BEGIN_INSTR(Ret)
         MOTH_END_INSTR(Ret)
 
-#ifndef QT_NO_QML_DEBUGGER
         MOTH_BEGIN_INSTR(Debug)
         MOTH_END_INSTR(Debug)
-#endif // QT_NO_QML_DEBUGGER
 
         MOTH_BEGIN_INSTR(LoadQmlContext)
             d << dumpRegister(result, nFormals);
diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index 6fa33facab..4eeeed1fbc 100644
--- a/src/qml/compiler/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
@@ -56,13 +56,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#if !QT_CONFIG(qml_debug)
-#define MOTH_DEBUG_INSTR(F)
-#else
-#define MOTH_DEBUG_INSTR(F) \
-    F(Debug)
-#endif
-
 #define INSTRUCTION(op, name, nargs, ...) \
     op##_INSTRUCTION(name, nargs, __VA_ARGS__)
 
diff --git a/src/qml/jsruntime/qv4profiling_p.h b/src/qml/jsruntime/qv4profiling_p.h
index 74298e684b..c69d1e4cf6 100644
--- a/src/qml/jsruntime/qv4profiling_p.h
+++ b/src/qml/jsruntime/qv4profiling_p.h
@@ -67,6 +67,10 @@ QT_BEGIN_NAMESPACE
 namespace QV4 {
 namespace Profiling {
 class Profiler {};
+class FunctionCallProfiler {
+public:
+    FunctionCallProfiler(ExecutionEngine *, Function *) {}
+};
 }
 }
 
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index 91558ba103..c761846e67 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -1341,12 +1341,12 @@ QV4::ReturnedValue VME::exec(const FunctionObject *fo, const Value *thisObject,
         goto functionExit;
     MOTH_END_INSTR(Ret)
 
-#if QT_CONFIG(qml_debug)
     MOTH_BEGIN_INSTR(Debug)
+#if QT_CONFIG(qml_debug)
         STORE_IP();
         debug_slowPath(engine);
-    MOTH_END_INSTR(Debug)
 #endif // QT_CONFIG(qml_debug)
+    MOTH_END_INSTR(Debug)
 
     MOTH_BEGIN_INSTR(LoadQmlContext)
         STACK_VALUE(result) = Runtime::method_loadQmlContext(static_cast<QV4::NoThrowEngine*>(engine));