# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1381835034 -7200
# Node ID 5b1a2e8e82d608ad70dfeff10822e31c2b963573
# Parent  8c53ba3efbc967bb66c41378316ddafd867c8b61
make EscapeObjectState value numberable

diff -r 8c53ba3efbc9 -r 5b1a2e8e82d6 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	Tue Oct 15 11:32:32 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java	Tue Oct 15 13:03:54 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 8c53ba3efbc9 -r 5b1a2e8e82d6 graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializedObjectState.java
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializedObjectState.java	Tue Oct 15 11:32:32 2013 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializedObjectState.java	Tue Oct 15 13:03:54 2013 +0200
@@ -44,7 +44,7 @@
 
     @Override
     public MaterializedObjectState duplicateWithVirtualState() {
-        return graph().addWithoutUnique(new MaterializedObjectState(object(), materializedValue));
+        return graph().unique(new MaterializedObjectState(object(), materializedValue));
     }
 
     @Override
diff -r 8c53ba3efbc9 -r 5b1a2e8e82d6 graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java	Tue Oct 15 11:32:32 2013 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java	Tue Oct 15 13:03:54 2013 +0200
@@ -53,7 +53,7 @@
 
     @Override
     public VirtualObjectState duplicateWithVirtualState() {
-        return graph().addWithoutUnique(new VirtualObjectState(object(), fieldValues));
+        return graph().unique(new VirtualObjectState(object(), fieldValues));
     }
 
     @Override
diff -r 8c53ba3efbc9 -r 5b1a2e8e82d6 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	Tue Oct 15 11:32:32 2013 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/GraphEffectList.java	Tue Oct 15 13:03:54 2013 +0200
@@ -178,7 +178,7 @@
                         stateAfter.virtualObjectMappings().remove(i);
                     }
                 }
-                stateAfter.addVirtualObjectMapping(graph.addWithoutUnique(state));
+                stateAfter.addVirtualObjectMapping(graph.unique(state));
             }
 
             @Override