src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalUtil.java

*** 20,47 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.microbenchmarks.graal.util;
  
- import static org.graalvm.compiler.core.common.CompilationIdentifier.INVALID_COMPILATION_ID;
- 
  import java.lang.reflect.Method;
  import java.util.List;
  
! import jdk.vm.ci.meta.MetaAccessProvider;
! import jdk.vm.ci.meta.ResolvedJavaMethod;
! 
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.java.GraphBuilderPhase;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
- import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  
  public class GraalUtil {
  
      public static Method getMethod(Class<?> declaringClass, String name, Class<?>... parameterTypes) {
          try {
              if (parameterTypes == null) {
--- 20,48 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.microbenchmarks.graal.util;
  
  import java.lang.reflect.Method;
  import java.util.List;
  
! import org.graalvm.compiler.api.test.Graal;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.java.GraphBuilderPhase;
  import org.graalvm.compiler.nodes.StructuredGraph;
+ import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+ import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
+ import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  
+ import jdk.vm.ci.meta.MetaAccessProvider;
+ import jdk.vm.ci.meta.ResolvedJavaMethod;
+ 
  public class GraalUtil {
  
      public static Method getMethod(Class<?> declaringClass, String name, Class<?>... parameterTypes) {
          try {
              if (parameterTypes == null) {
*** 131,141 ****
      public static StructuredGraph getGraph(GraalState graal, ResolvedJavaMethod javaMethod) {
          return getGraph(graal, javaMethod, StructuredGraph.USE_PROFILING_INFO);
      }
  
      public static StructuredGraph getGraph(GraalState graal, ResolvedJavaMethod javaMethod, boolean useProfilingInfo) {
!         StructuredGraph graph = new StructuredGraph(javaMethod, StructuredGraph.AllowAssumptions.YES, useProfilingInfo, INVALID_COMPILATION_ID);
          PhaseSuite<HighTierContext> graphBuilderSuite = new PhaseSuite<>();
          MetaAccessProvider metaAccess = graal.providers.getMetaAccess();
          graphBuilderSuite.appendPhase(new GraphBuilderPhase(GraphBuilderConfiguration.getDefault(new Plugins(new InvocationPlugins(metaAccess)))));
          graphBuilderSuite.apply(graph, new HighTierContext(graal.providers, graphBuilderSuite, OptimisticOptimizations.ALL));
          return graph;
--- 132,142 ----
      public static StructuredGraph getGraph(GraalState graal, ResolvedJavaMethod javaMethod) {
          return getGraph(graal, javaMethod, StructuredGraph.USE_PROFILING_INFO);
      }
  
      public static StructuredGraph getGraph(GraalState graal, ResolvedJavaMethod javaMethod, boolean useProfilingInfo) {
!         StructuredGraph graph = new StructuredGraph.Builder(Graal.getRequiredCapability(OptionValues.class), AllowAssumptions.YES).useProfilingInfo(useProfilingInfo).method(javaMethod).build();
          PhaseSuite<HighTierContext> graphBuilderSuite = new PhaseSuite<>();
          MetaAccessProvider metaAccess = graal.providers.getMetaAccess();
          graphBuilderSuite.appendPhase(new GraphBuilderPhase(GraphBuilderConfiguration.getDefault(new Plugins(new InvocationPlugins(metaAccess)))));
          graphBuilderSuite.apply(graph, new HighTierContext(graal.providers, graphBuilderSuite, OptimisticOptimizations.ALL));
          return graph;