src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java

*** 81,90 ****
--- 81,91 ----
  import jdk.vm.ci.meta.ConstantReflectionProvider;
  import jdk.vm.ci.meta.JavaKind;
  import jdk.vm.ci.meta.JavaType;
  import jdk.vm.ci.meta.MetaAccessProvider;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
+ import jdk.vm.ci.meta.ResolvedJavaType;
  import jdk.vm.ci.meta.Signature;
  
  /**
   * A utility for manually creating a graph. This will be expanded as necessary to support all
   * subsystems that employ manual graph creation (as opposed to {@linkplain GraphBuilderPhase
*** 216,230 ****
          ResolvedJavaMethod method = findMethod(declaringClass, name, isStatic);
          return createInvoke(method, invokeKind, frameStateBuilder, bci, args);
      }
  
      public ResolvedJavaMethod findMethod(Class<?> declaringClass, String name, boolean isStatic) {
          ResolvedJavaMethod method = null;
!         for (Method m : declaringClass.getDeclaredMethods()) {
              if (Modifier.isStatic(m.getModifiers()) == isStatic && m.getName().equals(name)) {
                  assert method == null : "found more than one method in " + declaringClass + " named " + name;
!                 method = providers.getMetaAccess().lookupJavaMethod(m);
              }
          }
          GraalError.guarantee(method != null, "Could not find %s.%s (%s)", declaringClass, name, isStatic ? "static" : "non-static");
          return method;
      }
--- 217,232 ----
          ResolvedJavaMethod method = findMethod(declaringClass, name, isStatic);
          return createInvoke(method, invokeKind, frameStateBuilder, bci, args);
      }
  
      public ResolvedJavaMethod findMethod(Class<?> declaringClass, String name, boolean isStatic) {
+         ResolvedJavaType type = providers.getMetaAccess().lookupJavaType(declaringClass);
          ResolvedJavaMethod method = null;
!         for (ResolvedJavaMethod m : type.getDeclaredMethods()) {
              if (Modifier.isStatic(m.getModifiers()) == isStatic && m.getName().equals(name)) {
                  assert method == null : "found more than one method in " + declaringClass + " named " + name;
!                 method = m;
              }
          }
          GraalError.guarantee(method != null, "Could not find %s.%s (%s)", declaringClass, name, isStatic ? "static" : "non-static");
          return method;
      }
*** 354,364 ****
  
          MetaAccessProvider metaAccess = providers.getMetaAccess();
          Plugins plugins = new Plugins(graphBuilderPlugins);
          GraphBuilderConfiguration config = GraphBuilderConfiguration.getSnippetDefault(plugins);
  
!         StructuredGraph calleeGraph = new StructuredGraph.Builder(invoke.getOptions(), invoke.getDebug()).method(method).trackNodeSourcePosition(invoke.graph().trackNodeSourcePosition()).build();
          IntrinsicContext initialReplacementContext = new IntrinsicContext(method, method, providers.getReplacements().getDefaultReplacementBytecodeProvider(), INLINE_AFTER_PARSING);
          GraphBuilderPhase.Instance instance = createGraphBuilderInstance(metaAccess, providers.getStampProvider(), providers.getConstantReflection(), providers.getConstantFieldProvider(), config,
                          OptimisticOptimizations.NONE,
                          initialReplacementContext);
          instance.apply(calleeGraph);
--- 356,367 ----
  
          MetaAccessProvider metaAccess = providers.getMetaAccess();
          Plugins plugins = new Plugins(graphBuilderPlugins);
          GraphBuilderConfiguration config = GraphBuilderConfiguration.getSnippetDefault(plugins);
  
!         StructuredGraph calleeGraph = new StructuredGraph.Builder(invoke.getOptions(), invoke.getDebug()).method(method).trackNodeSourcePosition(
!                         invoke.graph().trackNodeSourcePosition()).setIsSubstitution(true).build();
          IntrinsicContext initialReplacementContext = new IntrinsicContext(method, method, providers.getReplacements().getDefaultReplacementBytecodeProvider(), INLINE_AFTER_PARSING);
          GraphBuilderPhase.Instance instance = createGraphBuilderInstance(metaAccess, providers.getStampProvider(), providers.getConstantReflection(), providers.getConstantFieldProvider(), config,
                          OptimisticOptimizations.NONE,
                          initialReplacementContext);
          instance.apply(calleeGraph);