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

*** 21,43 ****
   * questions.
   */
  package org.graalvm.compiler.hotspot.test;
  
  import static org.graalvm.compiler.core.common.CompilationIdentifier.INVALID_COMPILATION_ID;
- 
  import java.util.List;
  
  import org.graalvm.compiler.api.test.Graal;
  import org.graalvm.compiler.core.test.GraalCompilerTest;
  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;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Binding;
  import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin;
  import org.graalvm.compiler.runtime.RuntimeProvider;
  import org.graalvm.util.EconomicMap;
  import org.junit.Test;
  
--- 21,44 ----
   * questions.
   */
  package org.graalvm.compiler.hotspot.test;
  
  import static org.graalvm.compiler.core.common.CompilationIdentifier.INVALID_COMPILATION_ID;
  import java.util.List;
  
  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;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Binding;
+ import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin;
  import org.graalvm.compiler.runtime.RuntimeProvider;
  import org.graalvm.util.EconomicMap;
  import org.junit.Test;
  
*** 61,77 ****
          InvocationPlugins invocationPlugins = graphBuilderPlugins.getInvocationPlugins();
  
          EconomicMap<String, List<Binding>> bindings = invocationPlugins.getBindings(true);
          HotSpotVMConfigStore store = rt.getVMConfig().getStore();
          List<VMIntrinsicMethod> intrinsics = store.getIntrinsics();
          for (VMIntrinsicMethod intrinsic : intrinsics) {
              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, getInitialOptions());
                          getCode(method, graph);
                      }
                  }
              }
          }
--- 62,80 ----
          InvocationPlugins invocationPlugins = graphBuilderPlugins.getInvocationPlugins();
  
          EconomicMap<String, List<Binding>> bindings = invocationPlugins.getBindings(true);
          HotSpotVMConfigStore store = rt.getVMConfig().getStore();
          List<VMIntrinsicMethod> intrinsics = store.getIntrinsics();
+         OptionValues options = getInitialOptions();
+         DebugContext debug = getDebugContext(options);
          for (VMIntrinsicMethod intrinsic : intrinsics) {
              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);
                      }
                  }
              }
          }