Fix bugs in LiveInterval, successfully calculate (gapless) LIR

1 files changed, 7 insertions, 3 deletions

diff --git a/vaporize/library/LIRVar.java b/vaporize/library/LIRVar.java
index 4fab8c8..eb3508b 100644
--- a/vaporize/library/LIRVar.java
+++ b/vaporize/library/LIRVar.java
@@ -23,10 +23,9 @@ public class LIRVar implements Comparable<LIRVar> {
     }
 
     @Override public boolean equals(Object other) {
-        LIRVar o;
         return (other instanceof LIRVar &&
-                ((o = (LIRVar) other)).alias.equals(this.alias) &&
-                o.interval.equals(this.interval)) ||
+                ((LIRVar) other).alias.equals(this.alias) &&
+                ((LIRVar) other).interval.equals(this.interval)) ||
             (other instanceof String &&
              this.alias.equals((String) other));
     }
@@ -55,6 +54,11 @@ public class LIRVar implements Comparable<LIRVar> {
 
         if (ret)
             this.interval.last_use = last_use;
+        else
+            MinimalLogger.info(String.format("Bad order! %s %d >= %d",
+                                             this.alias,
+                                             this.interval.last_use,
+                                             last_use));
         return ret;
     }