Mercurial > hg > graal-compiler
changeset 12475:7022b22647ed
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 17 Oct 2013 15:58:41 +0200 |
parents | f04f58c8206b (current diff) 237aff48d57e (diff) |
children | 67566565053a |
files | |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java Thu Oct 17 14:05:14 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java Thu Oct 17 15:58:41 2013 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.nodes.virtual; +import com.oracle.graal.graph.Node.*; import com.oracle.graal.nodes.*; -public abstract class EscapeObjectState extends VirtualState { +public abstract class EscapeObjectState extends VirtualState implements ValueNumberable { @Input private VirtualObjectNode object;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/GraphEffectList.java Thu Oct 17 14:05:14 2013 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/GraphEffectList.java Thu Oct 17 15:58:41 2013 +0200 @@ -178,7 +178,7 @@ stateAfter.virtualObjectMappings().remove(i); } } - stateAfter.addVirtualObjectMapping(graph.addWithoutUnique(state)); + stateAfter.addVirtualObjectMapping(graph.unique(state)); } @Override