# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1382018321 -7200
# Node ID 7022b22647ed62f8cdd4b7e8b3c9948fa2db3e6f
# Parent  f04f58c8206bdede4a5fe65a9b667703b7246e72# Parent  237aff48d57eb24518df030ae07513d8fd432116
Merge.

diff -r f04f58c8206b -r 7022b22647ed graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java
--- 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;
 
diff -r f04f58c8206b -r 7022b22647ed graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/GraphEffectList.java
--- 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