Mercurial > hg > truffle

changeset 15439:10023073e858

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Roland Schatz <roland.schatz@oracle.com>
date Tue, 29 Apr 2014 18:35:10 +0200
parents 105fe5c2160e (current diff) 34ae63dda6e8 (diff)
children 2f684eda1938
files graal/com.oracle.graal.asm.hsail/src/com/oracle/graal/asm/hsail/HSAILAssembler.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILMove.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java
diffstat 3 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);
     }
 
--- 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);
 }
--- 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);