# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1426639561 -3600
# Node ID 470fb57cfb317ef72404bc1e2fab3c0b5f3fb187
# Parent  842918052c50866c5eae09fb2adaf799c5ca7d21# Parent  815a87264cbb50a573fe48943cd26db634f384a5
Merge.

diff -r 815a87264cbb -r 470fb57cfb31 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/MemoryScheduleVerification.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/MemoryScheduleVerification.java	Tue Mar 17 11:23:06 2015 -0700
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/MemoryScheduleVerification.java	Wed Mar 18 01:46:01 2015 +0100
@@ -31,6 +31,7 @@
 import com.oracle.graal.nodes.*;
 import com.oracle.graal.nodes.cfg.*;
 import com.oracle.graal.nodes.extended.*;
+import com.oracle.graal.nodes.spi.*;
 import com.oracle.graal.phases.graph.*;
 import com.oracle.graal.phases.graph.ReentrantBlockIterator.BlockIteratorClosure;
 
@@ -78,6 +79,8 @@
                 }
 
                 addFloatingReadUsages(currentState, n);
+            } else if (n instanceof MemoryProxy) {
+                addFloatingReadUsages(currentState, n);
             } else if (n instanceof FloatingReadNode) {
                 FloatingReadNode floatingReadNode = (FloatingReadNode) n;
                 if (floatingReadNode.getLastLocationAccess() != null && floatingReadNode.getLocationIdentity().isMutable()) {