V4: remove unused field.

Change-Id: Id1edc073db349cfc7e4b5a9dca045760016ebacf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp
index 6b4d7e7..44c93df 100644 (file)
--- a/src/qml/compiler/qv4ssa.cpp
+++ b/src/qml/compiler/qv4ssa.cpp
@@ -3811,7 +3811,6 @@ void Optimizer::convertOutOfSSA() {
     // There should be no critical edges at this point.
 
     foreach (BasicBlock *bb, function->basicBlocks) {
-        const int id = bb->statements.last()->id;
         MoveMapping moves;
 
         foreach (BasicBlock *successor, bb->out) {
@@ -3820,7 +3819,7 @@ void Optimizer::convertOutOfSSA() {
             foreach (Stmt *s, successor->statements) {
                 if (Phi *phi = s->asPhi()) {
                     moves.add(clone(phi->d->incoming[inIdx], function),
-                              clone(phi->targetTemp, function)->asTemp(), id);
+                              clone(phi->targetTemp, function)->asTemp());
                 } else {
                     break;
                 }
@@ -3946,7 +3945,7 @@ MoveMapping::Moves MoveMapping::sourceUsages(Expr *e, const Moves &moves)
     return usages;
 }
 
-void MoveMapping::add(Expr *from, Temp *to, int id) {
+void MoveMapping::add(Expr *from, Temp *to) {
     if (Temp *t = from->asTemp()) {
         if (overlappingStorage(*t, *to)) {
             // assignments like fp1 = fp1 or var{&1} = double{&1} can safely be skipped.
@@ -3962,7 +3961,7 @@ void MoveMapping::add(Expr *from, Temp *to, int id) {
         }
     }
 
-    Move m(from, to, id);
+    Move m(from, to);
     if (_moves.contains(m))
         return;
     _moves.append(m);
@@ -3995,7 +3994,6 @@ void MoveMapping::insertMoves(BasicBlock *bb, Function *function, bool atEnd) co
     foreach (const Move &m, _moves) {
         V4IR::Move *move = function->New<V4IR::Move>();
         move->init(m.to, m.from);
-        move->id = m.id;
         move->swap = m.needsSwap;
         bb->statements.insert(insertionPoint++, move);
     }

diff --git a/src/qml/compiler/qv4ssa_p.h b/src/qml/compiler/qv4ssa_p.h
index 65d4f08..2ec81b9 100644 (file)
--- a/src/qml/compiler/qv4ssa_p.h
+++ b/src/qml/compiler/qv4ssa_p.h
@@ -170,11 +170,10 @@ class MoveMapping
     struct Move {
         Expr *from;
         Temp *to;
-        int id;
         bool needsSwap;
 
-        Move(Expr *from, Temp *to, int id)
-            : from(from), to(to), id(id), needsSwap(false)
+        Move(Expr *from, Temp *to)
+            : from(from), to(to), needsSwap(false)
         {}
 
         bool operator==(const Move &other) const
@@ -187,7 +186,7 @@ class MoveMapping
     static Moves sourceUsages(Expr *e, const Moves &moves);
 
 public:
-    void add(Expr *from, Temp *to, int id = 0);
+    void add(Expr *from, Temp *to);
     void order();
     void insertMoves(BasicBlock *bb, Function *function, bool atEnd) const;