# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1426338894 -3600
# Node ID 67e4da9a7c0e3e64880e91d7b526ef6646b003c0
# Parent  88e8fe50ccac7e9bb8c55046de165b99efbeb70c
Reduce # of MemoryCheckpoint#Multi.

diff -r 88e8fe50ccac -r 67e4da9a7c0e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java	Sat Mar 14 14:05:16 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java	Sat Mar 14 14:14:54 2015 +0100
@@ -40,7 +40,7 @@
  * A call to the runtime code {@code Deoptimization::fetch_unroll_info}.
  */
 @NodeInfo(allowedUsageTypes = {InputType.Memory})
-public final class DeoptimizationFetchUnrollInfoCallNode extends FixedWithNextNode implements LIRLowerable, MemoryCheckpoint.Multi {
+public final class DeoptimizationFetchUnrollInfoCallNode extends FixedWithNextNode implements LIRLowerable, MemoryCheckpoint.Single {
 
     public static final NodeClass<DeoptimizationFetchUnrollInfoCallNode> TYPE = NodeClass.create(DeoptimizationFetchUnrollInfoCallNode.class);
     @Input SaveAllRegistersNode registerSaver;
@@ -53,8 +53,8 @@
     }
 
     @Override
-    public LocationIdentity[] getLocationIdentities() {
-        return foreignCalls.getKilledLocations(FETCH_UNROLL_INFO);
+    public LocationIdentity getLocationIdentity() {
+        return LocationIdentity.any();
     }
 
     public SaveRegistersOp getSaveRegistersOp() {
diff -r 88e8fe50ccac -r 67e4da9a7c0e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java	Sat Mar 14 14:05:16 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java	Sat Mar 14 14:14:54 2015 +0100
@@ -40,7 +40,7 @@
  * A call to the runtime code implementing the uncommon trap logic.
  */
 @NodeInfo(allowedUsageTypes = {InputType.Memory})
-public final class UncommonTrapCallNode extends FixedWithNextNode implements LIRLowerable, MemoryCheckpoint.Multi {
+public final class UncommonTrapCallNode extends FixedWithNextNode implements LIRLowerable, MemoryCheckpoint.Single {
 
     public static final NodeClass<UncommonTrapCallNode> TYPE = NodeClass.create(UncommonTrapCallNode.class);
     @Input ValueNode trapRequest;
@@ -55,8 +55,8 @@
     }
 
     @Override
-    public LocationIdentity[] getLocationIdentities() {
-        return foreignCalls.getKilledLocations(UNCOMMON_TRAP);
+    public LocationIdentity getLocationIdentity() {
+        return LocationIdentity.any();
     }
 
     public SaveRegistersOp getSaveRegistersOp() {