changeset 9628:8851fabf2265

LinearScan: Can no longer check for object equality after removal of RegisterValue cache.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 09 May 2013 19:21:29 -0700
parents 29abc1e22280
children f7e06c106dda
files graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/MoveResolver.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java	Thu May 09 23:32:31 2013 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java	Thu May 09 19:21:29 2013 -0700
@@ -1780,7 +1780,7 @@
             // remove useless moves
             if (op instanceof MoveOp) {
                 MoveOp move = (MoveOp) op;
-                if (move.getInput() == move.getResult()) {
+                if (move.getInput().equals(move.getResult())) {
                     instructions.set(j, null);
                     hasDead = true;
                 }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/MoveResolver.java	Thu May 09 23:32:31 2013 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/MoveResolver.java	Thu May 09 19:21:29 2013 -0700
@@ -134,7 +134,7 @@
         }
         for (i = 0; i < mappingTo.size(); i++) {
             Interval interval = mappingTo.get(i);
-            assert !usedRegs.contains(interval.location()) || interval.location() == mappingFrom.get(i).location() : "stack slots used in mappingFrom must be disjoint to mappingTo";
+            assert !usedRegs.contains(interval.location()) || interval.location().equals(mappingFrom.get(i).location()) : "stack slots used in mappingFrom must be disjoint to mappingTo";
         }
 
         return true;