Mercurial > hg > graal-jvmci-8
changeset 9629:f7e06c106dda
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Thu, 09 May 2013 19:37:30 -0700 |
parents | 8851fabf2265 (diff) 1a009b20f816 (current diff) |
children | cd0c173593a8 |
files | |
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 21:07:04 2013 -0400 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java Thu May 09 19:37:30 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 21:07:04 2013 -0400 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/MoveResolver.java Thu May 09 19:37:30 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;