src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestIntrinsicCompiles.java

rev 52509 : [mq]: graal2

*** 30,40 ****
  
  import jdk.internal.vm.compiler.collections.EconomicMap;
  import org.graalvm.compiler.api.test.Graal;
  import org.graalvm.compiler.core.test.GraalCompilerTest;
  import org.graalvm.compiler.debug.DebugContext;
- import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
  import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
--- 30,39 ----
*** 46,66 ****
  import org.junit.Test;
  
  import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
  import jdk.vm.ci.hotspot.VMIntrinsicMethod;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
- import jdk.vm.ci.runtime.JVMCI;
  
  /**
   * Exercise the compilation of intrinsic method substitutions.
   */
  public class TestIntrinsicCompiles extends GraalCompilerTest {
  
      @Test
      @SuppressWarnings("try")
      public void test() throws ClassNotFoundException {
-         HotSpotGraalCompiler compiler = (HotSpotGraalCompiler) JVMCI.getRuntime().getCompiler();
          HotSpotGraalRuntimeProvider rt = (HotSpotGraalRuntimeProvider) Graal.getRequiredCapability(RuntimeProvider.class);
          HotSpotProviders providers = rt.getHostBackend().getProviders();
          Plugins graphBuilderPlugins = providers.getGraphBuilderPlugins();
          InvocationPlugins invocationPlugins = graphBuilderPlugins.getInvocationPlugins();
  
--- 45,63 ----
*** 73,83 ****
              InvocationPlugin plugin = CheckGraalIntrinsics.findPlugin(bindings, intrinsic);
              if (plugin != null) {
                  if (plugin instanceof MethodSubstitutionPlugin) {
                      ResolvedJavaMethod method = CheckGraalIntrinsics.resolveIntrinsic(getMetaAccess(), intrinsic);
                      if (!method.isNative()) {
!                         StructuredGraph graph = compiler.getIntrinsicGraph(method, providers, INVALID_COMPILATION_ID, options, debug);
                          getCode(method, graph);
                      }
                  }
              }
          }
--- 70,80 ----
              InvocationPlugin plugin = CheckGraalIntrinsics.findPlugin(bindings, intrinsic);
              if (plugin != null) {
                  if (plugin instanceof MethodSubstitutionPlugin) {
                      ResolvedJavaMethod method = CheckGraalIntrinsics.resolveIntrinsic(getMetaAccess(), intrinsic);
                      if (!method.isNative()) {
!                         StructuredGraph graph = providers.getReplacements().getIntrinsicGraph(method, INVALID_COMPILATION_ID, debug);
                          getCode(method, graph);
                      }
                  }
              }
          }