src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java

*** 947,957 ****
              StructuredGraph graphToCompile = graph == null ? parseForCompile(installedCodeOwner, id, options) : graph;
              DebugContext debug = graphToCompile.getDebug();
  
              try (AllocSpy spy = AllocSpy.open(installedCodeOwner); DebugContext.Scope ds = debug.scope("Compiling", new DebugDumpScope(id.toString(CompilationIdentifier.Verbosity.ID), true))) {
                  CompilationPrinter printer = CompilationPrinter.begin(options, id, installedCodeOwner, INVOCATION_ENTRY_BCI);
!                 CompilationResult compResult = compile(installedCodeOwner, graphToCompile, new CompilationResult(), id, options);
                  printer.finish(compResult);
  
                  try (DebugContext.Scope s = debug.scope("CodeInstall", getCodeCache(), installedCodeOwner, compResult);
                                  DebugContext.Activation a = debug.activate()) {
                      try {
--- 947,957 ----
              StructuredGraph graphToCompile = graph == null ? parseForCompile(installedCodeOwner, id, options) : graph;
              DebugContext debug = graphToCompile.getDebug();
  
              try (AllocSpy spy = AllocSpy.open(installedCodeOwner); DebugContext.Scope ds = debug.scope("Compiling", new DebugDumpScope(id.toString(CompilationIdentifier.Verbosity.ID), true))) {
                  CompilationPrinter printer = CompilationPrinter.begin(options, id, installedCodeOwner, INVOCATION_ENTRY_BCI);
!                 CompilationResult compResult = compile(installedCodeOwner, graphToCompile, new CompilationResult(graphToCompile.compilationId()), id, options);
                  printer.finish(compResult);
  
                  try (DebugContext.Scope s = debug.scope("CodeInstall", getCodeCache(), installedCodeOwner, compResult);
                                  DebugContext.Activation a = debug.activate()) {
                      try {
*** 1017,1037 ****
       *            be obtained from {@code installedCodeOwner} via
       *            {@link #parseForCompile(ResolvedJavaMethod)}.
       */
      protected final CompilationResult compile(ResolvedJavaMethod installedCodeOwner, StructuredGraph graph) {
          OptionValues options = graph == null ? getInitialOptions() : graph.getOptions();
!         return compile(installedCodeOwner, graph, new CompilationResult(), getOrCreateCompilationId(installedCodeOwner, graph), options);
      }
  
      protected final CompilationResult compile(ResolvedJavaMethod installedCodeOwner, StructuredGraph graph, CompilationIdentifier compilationId) {
          OptionValues options = graph == null ? getInitialOptions() : graph.getOptions();
!         return compile(installedCodeOwner, graph, new CompilationResult(), compilationId, options);
      }
  
      protected final CompilationResult compile(ResolvedJavaMethod installedCodeOwner, StructuredGraph graph, OptionValues options) {
          assert graph == null || graph.getOptions() == options;
!         return compile(installedCodeOwner, graph, new CompilationResult(), getOrCreateCompilationId(installedCodeOwner, graph), options);
      }
  
      /**
       * Compiles a given method.
       *
--- 1017,1039 ----
       *            be obtained from {@code installedCodeOwner} via
       *            {@link #parseForCompile(ResolvedJavaMethod)}.
       */
      protected final CompilationResult compile(ResolvedJavaMethod installedCodeOwner, StructuredGraph graph) {
          OptionValues options = graph == null ? getInitialOptions() : graph.getOptions();
!         CompilationIdentifier compilationId = getOrCreateCompilationId(installedCodeOwner, graph);
!         return compile(installedCodeOwner, graph, new CompilationResult(compilationId), compilationId, options);
      }
  
      protected final CompilationResult compile(ResolvedJavaMethod installedCodeOwner, StructuredGraph graph, CompilationIdentifier compilationId) {
          OptionValues options = graph == null ? getInitialOptions() : graph.getOptions();
!         return compile(installedCodeOwner, graph, new CompilationResult(compilationId), compilationId, options);
      }
  
      protected final CompilationResult compile(ResolvedJavaMethod installedCodeOwner, StructuredGraph graph, OptionValues options) {
          assert graph == null || graph.getOptions() == options;
!         CompilationIdentifier compilationId = getOrCreateCompilationId(installedCodeOwner, graph);
!         return compile(installedCodeOwner, graph, new CompilationResult(compilationId), compilationId, options);
      }
  
      /**
       * Compiles a given method.
       *