Mercurial > hg > icedrobot > daneel

changeset 89:463222781d67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix: in Interpreter.merge, a register should not be merge with itself
author forax
date Sun, 27 Mar 2011 23:49:35 +0200
parents 73f2f6cbd446
children b7b15d19d6ef
files src/main/java/org/icedrobot/daneel/rewriter/Interpreter.java
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/org/icedrobot/daneel/rewriter/Interpreter.java	Sun Mar 27 21:08:24 2011 +0200
+++ b/src/main/java/org/icedrobot/daneel/rewriter/Interpreter.java	Sun Mar 27 23:49:35 2011 +0200
@@ -177,7 +177,12 @@
         }
 
         for (int i = 0; i < registers.length; i++) {
-            this.registers[i] = this.registers[i].merge(registers[i]);
+            Register thisRegister = this.registers[i];
+            Register register = registers[i];
+            if (thisRegister == register) {
+                continue;
+            }
+            this.registers[i] = thisRegister.merge(register);
         }
     }