# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1398789310 -7200
# Node ID 10023073e8580d8effc91a970f060aab50ef3cd2
# Parent  105fe5c2160ea449e067028c13772d6322f660b8# Parent  34ae63dda6e85157160bd61abec23eb5ffaad687
Merge.

diff -r 105fe5c2160e -r 10023073e858 graal/com.oracle.graal.asm.hsail/src/com/oracle/graal/asm/hsail/HSAILAssembler.java
diff -r 105fe5c2160e -r 10023073e858 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java	Tue Apr 29 17:17:34 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java	Tue Apr 29 18:35:10 2014 +0200
@@ -288,7 +288,7 @@
         return stamp;
     }
 
-    private ValueNode implicitLoadConvert(StructuredGraph graph, Kind kind, ValueNode value) {
+    public ValueNode implicitLoadConvert(StructuredGraph graph, Kind kind, ValueNode value) {
         return implicitLoadConvert(graph, kind, value, true);
     }
 
@@ -334,7 +334,7 @@
         }
     }
 
-    private ValueNode implicitStoreConvert(StructuredGraph graph, Kind kind, ValueNode value) {
+    public ValueNode implicitStoreConvert(StructuredGraph graph, Kind kind, ValueNode value) {
         return implicitStoreConvert(graph, kind, value, true);
     }
 
diff -r 105fe5c2160e -r 10023073e858 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java
diff -r 105fe5c2160e -r 10023073e858 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java	Tue Apr 29 17:17:34 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java	Tue Apr 29 18:35:10 2014 +0200
@@ -39,4 +39,8 @@
     int getScalingFactor(Kind kind);
 
     IndexedLocationNode createArrayLocation(Graph graph, Kind elementKind, ValueNode index, boolean initialization);
+
+    ValueNode implicitLoadConvert(StructuredGraph graph, Kind kind, ValueNode value);
+
+    ValueNode implicitStoreConvert(StructuredGraph graph, Kind kind, ValueNode value);
 }
diff -r 105fe5c2160e -r 10023073e858 graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILMove.java
diff -r 105fe5c2160e -r 10023073e858 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java	Tue Apr 29 17:17:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java	Tue Apr 29 18:35:10 2014 +0200
@@ -150,7 +150,9 @@
         if (fixed instanceof StateSplit) {
             FrameState stateAfter = ((StateSplit) fixed).stateAfter();
             ((StateSplit) fixed).setStateAfter(null);
-            killWithUnusedFloatingInputs(stateAfter);
+            if (stateAfter.usages().isEmpty()) {
+                killWithUnusedFloatingInputs(stateAfter);
+            }
         }
         FixedNode next = fixed.next();
         fixed.setNext(null);