# HG changeset patch # User Roland Schatz # Date 1445422400 -7200 # Node ID 635316e7ee7b1ef04bfc97fced988d16f7c25d6c # Parent aa5c2df881dd47932fd5fa8541c7b3fa8a310210 Don't use global Graal singleton in ArrayCopyCallNode. diff -r aa5c2df881dd -r 635316e7ee7b graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyCallNode.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyCallNode.java Wed Oct 21 12:11:33 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyCallNode.java Wed Oct 21 12:13:20 2015 +0200 @@ -32,7 +32,6 @@ import jdk.vm.ci.meta.LocationIdentity; import jdk.vm.ci.meta.PrimitiveConstant; -import com.oracle.graal.api.runtime.Graal; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.compiler.common.type.StampFactory; @@ -61,7 +60,6 @@ import com.oracle.graal.nodes.memory.address.OffsetAddressNode; import com.oracle.graal.nodes.spi.Lowerable; import com.oracle.graal.nodes.spi.LoweringTool; -import com.oracle.graal.runtime.RuntimeProvider; @NodeInfo(allowedUsageTypes = {InputType.Memory}) public final class ArrayCopyCallNode extends AbstractMemoryCheckpoint implements Lowerable, MemoryCheckpoint.Single, MemoryAccess, Canonicalizable { @@ -162,7 +160,7 @@ if (len.stamp().getStackKind() != JavaKind.Long) { len = IntegerConvertNode.convert(len, StampFactory.forKind(JavaKind.Long), graph()); } - ForeignCallNode call = graph.add(new ForeignCallNode(Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getForeignCalls(), desc, srcAddr, destAddr, len)); + ForeignCallNode call = graph.add(new ForeignCallNode(runtime.getHostBackend().getForeignCalls(), desc, srcAddr, destAddr, len)); call.setStateAfter(stateAfter()); graph.replaceFixedWithFixed(this, call); }