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

*** 33,42 ****
--- 33,43 ----
  import org.graalvm.compiler.core.common.GraalOptions;
  import org.graalvm.compiler.core.target.Backend;
  import org.graalvm.compiler.core.test.GraalCompilerTest;
  import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.nodes.StructuredGraph;
+ import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
  import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.util.Providers;
  import org.graalvm.compiler.runtime.RuntimeProvider;
*** 93,103 ****
                                  }
                              }
                          }
                      }
                      if (!original.isNative()) {
!                         ret.add(new Object[]{original});
                      }
                  }
              }
          }
          return ret;
--- 94,108 ----
                                  }
                              }
                          }
                      }
                      if (!original.isNative()) {
!                         // Make sure the plugin we found hasn't been overridden.
!                         InvocationPlugin plugin = providers.getReplacements().getGraphBuilderPlugins().getInvocationPlugins().lookupInvocation(original);
!                         if (plugin instanceof MethodSubstitutionPlugin) {
!                             ret.add(new Object[]{original});
!                         }
                      }
                  }
              }
          }
          return ret;