Fix temp compression, and actually add var decl instructions.

Change-Id: Ic73a8e4284fd7644e37251498a659e107e49f0d8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/moth/qv4isel_moth.cpp b/moth/qv4isel_moth.cpp
index a3d03d4..ed70b42 100644 (file)
--- a/moth/qv4isel_moth.cpp
+++ b/moth/qv4isel_moth.cpp
@@ -29,6 +29,7 @@ class CompressTemps: public IR::StmtVisitor, IR::ExprVisitor
 public:
     void run(IR::Function *function)
     {
+        _seenTemps.clear();
         _nextFree = 0;
         _active.reserve(function->tempCount);
         _localCount = function->locals.size();
@@ -90,6 +91,10 @@ private:
     virtual void visitRet(IR::Ret *s) { s->expr->accept(this); }
 
     virtual void visitTemp(IR::Temp *e) {
+        if (_seenTemps.contains(e))
+            return;
+        _seenTemps.insert(e);
+
         if (e->index < 0)
             return;
         if (e->index < _localCount) // don't optimise locals yet.
@@ -173,6 +178,7 @@ private:
 private:
     typedef QVector<QPair<int, int> > ActiveTemps;
     ActiveTemps _active;
+    QSet<IR::Temp *> _seenTemps;
     IR::Stmt *_currentStatement;
     int _localCount;
     int _nextFree;
@@ -410,6 +416,7 @@ void InstructionSelection::callActivationProperty(IR::Call *c, int targetTempInd
             Instruction::CallBuiltinDeclareVar call;
             call.isDeletable = isDeletable;
             call.varName = engine()->newString(*it->expr->asName()->id);
+            addInstruction(call);
         }
     } break;