# HG changeset patch # User Doug Simon # Date 1365118149 -7200 # Node ID f2bcc49a14306d7e54e5e5a350564c4e8d602ce0 # Parent 8d6265614e13ce72ef0f9ed9bc39dc294db1c31c passed a Replacements object to ArrayCopyNode and ObjectCloneNode instead of using the Graal.getRequiredCapability() API diff -r 8d6265614e13 -r f2bcc49a1430 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ArrayCopyNode.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ArrayCopyNode.java Fri Apr 05 01:26:48 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ArrayCopyNode.java Fri Apr 05 01:29:09 2013 +0200 @@ -23,7 +23,6 @@ package com.oracle.graal.hotspot.replacements; import com.oracle.graal.api.meta.*; -import com.oracle.graal.api.runtime.*; import com.oracle.graal.debug.*; import com.oracle.graal.graph.Node.IterableNodeType; import com.oracle.graal.loop.phases.*; @@ -93,7 +92,7 @@ return null; } - Replacements replacements = Graal.getRequiredCapability(Replacements.class); + Replacements replacements = tool.getReplacements(); StructuredGraph snippetGraph = selectSnippet(tool, replacements); if (snippetGraph == null) { ResolvedJavaMethod snippetMethod = tool.getRuntime().lookupJavaMethod(ArrayCopySnippets.genericArraycopySnippet); diff -r 8d6265614e13 -r f2bcc49a1430 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneNode.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneNode.java Fri Apr 05 01:26:48 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneNode.java Fri Apr 05 01:29:09 2013 +0200 @@ -26,7 +26,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.api.runtime.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.java.*; import com.oracle.graal.nodes.spi.*; @@ -70,7 +69,7 @@ method = ObjectCloneSnippets.instanceCloneMethod; } ResolvedJavaMethod snippetMethod = tool.getRuntime().lookupJavaMethod(method); - Replacements replacements = Graal.getRequiredCapability(Replacements.class); + Replacements replacements = tool.getReplacements(); StructuredGraph snippetGraph = replacements.getSnippet(snippetMethod); assert snippetGraph != null : "ObjectCloneSnippets should be installed";