1 files changed, 2 insertions, 33 deletions
diff --git a/src/qml/compiler/qv4instr_moth.cpp b/src/qml/compiler/qv4instr_moth.cpp
index 5148154a6a..8a9bd66103 100644
--- a/src/qml/compiler/qv4instr_moth.cpp
+++ b/src/qml/compiler/qv4instr_moth.cpp
@@ -39,7 +39,7 @@
 
 #include "qv4instr_moth_p.h"
 #include <private/qv4compileddata_p.h>
-#include <private/qv4stackframe_p.h>
+#include <private/qv4calldata_p.h>
 
 using namespace QV4;
 using namespace QV4::Moth;
@@ -56,9 +56,7 @@ int InstrInfo::size(Instr::Type type)
 
 static QByteArray alignedNumber(int n) {
     QByteArray number = QByteArray::number(n);
-    while (number.size() < 8)
-        number.prepend(' ');
-    return number;
+    return number.prepend(8 - number.size(), ' ');
 }
 
 static QByteArray alignedLineNumber(int line) {
@@ -83,25 +81,6 @@ static QByteArray rawBytes(const char *data, int n)
     return ba;
 }
 
-static QString toString(QV4::ReturnedValue v)
-{
-#ifdef V4_BOOTSTRAP
-    return QStringLiteral("string-const(%1)").arg(v);
-#else // !V4_BOOTSTRAP
-    Value val = Value::fromReturnedValue(v);
-    QString result;
-    if (val.isInt32())
-        result = QLatin1String("int ");
-    else if (val.isDouble())
-        result = QLatin1String("double ");
-    if (val.isEmpty())
-        result += QLatin1String("empty");
-    else
-        result += val.toQStringNoThrow();
-    return result;
-#endif // V4_BOOTSTRAP
-}
-
 #define ABSOLUTE_OFFSET() \
     (code - start + offset)
 
@@ -128,16 +107,6 @@ const int InstrInfo::argumentCount[] = {
     FOR_EACH_MOTH_INSTR_ALL(MOTH_COLLECT_NARGS)
 };
 
-
-void dumpConstantTable(const Value *constants, uint count)
-{
-    QDebug d = qDebug();
-    d.nospace();
-    for (uint i = 0; i < count; ++i)
-        d << alignedNumber(int(i)).constData() << ":    "
-          << toString(constants[i].asReturnedValue()).toUtf8().constData() << "\n";
-}
-
 QString dumpRegister(int reg, int nFormals)
 {
     Q_STATIC_ASSERT(offsetof(CallData, function) == 0);