changeset 19052:db390d92bb16

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 31 Jan 2015 19:03:33 +0100
parents 687479c0cd3e (diff) 75da87c96605 (current diff)
children fa4e9a76a5ed
files graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMappable.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMappingTool.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/SimpleStackSlotAllocator.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/StackSlotAllocator.java graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java	Sat Jan 31 00:30:00 2015 +0100
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java	Sat Jan 31 19:03:33 2015 +0100
@@ -1072,6 +1072,12 @@
             return;
         }
 
+        if (i instanceof ProxyNode) {
+            ProxyNode proxyNode = (ProxyNode) i;
+            addToLatestSorting(proxyNode.value(), state);
+            return;
+        }
+
         FrameState stateAfter = null;
         if (i instanceof StateSplit) {
             stateAfter = ((StateSplit) i).stateAfter();
@@ -1087,10 +1093,6 @@
             }
         }
 
-        if (i instanceof ProxyNode) {
-            return;
-        }
-
         if (state.readsSize() != 0) {
             if (i instanceof MemoryCheckpoint.Single) {
                 LocationIdentity identity = ((MemoryCheckpoint.Single) i).getLocationIdentity();