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

*** 22,32 ****
   */
  
  
  package org.graalvm.compiler.hotspot.test;
  
! import static org.graalvm.compiler.core.GraalCompilerOptions.CompilationBailoutAction;
  import static org.graalvm.compiler.core.GraalCompilerOptions.CompilationFailureAction;
  
  import jdk.internal.vm.compiler.collections.EconomicMap;
  import org.graalvm.compiler.core.CompilationWrapper.ExceptionAction;
  import org.graalvm.compiler.core.test.GraalCompilerTest;
--- 22,32 ----
   */
  
  
  package org.graalvm.compiler.hotspot.test;
  
! import static org.graalvm.compiler.core.GraalCompilerOptions.CompilationBailoutAsFailure;
  import static org.graalvm.compiler.core.GraalCompilerOptions.CompilationFailureAction;
  
  import jdk.internal.vm.compiler.collections.EconomicMap;
  import org.graalvm.compiler.core.CompilationWrapper.ExceptionAction;
  import org.graalvm.compiler.core.test.GraalCompilerTest;
*** 42,58 ****
   */
  public class CompileTheWorldTest extends GraalCompilerTest {
  
      @Test
      public void testJDK() throws Throwable {
!         ExceptionAction originalBailoutAction = CompilationBailoutAction.getValue(getInitialOptions());
          ExceptionAction originalFailureAction = CompilationFailureAction.getValue(getInitialOptions());
          // Compile a couple classes in rt.jar
          HotSpotJVMCIRuntime runtime = HotSpotJVMCIRuntime.runtime();
          System.setProperty("CompileTheWorld.LimitModules", "java.base");
          OptionValues initialOptions = getInitialOptions();
          EconomicMap<OptionKey<?>, Object> compilationOptions = CompileTheWorld.parseOptions("Inline=false");
          new CompileTheWorld(runtime, (HotSpotGraalCompiler) runtime.getCompiler(), CompileTheWorld.SUN_BOOT_CLASS_PATH, 1, 5, null, null, false, initialOptions, compilationOptions).compile();
!         assert CompilationBailoutAction.getValue(initialOptions) == originalBailoutAction;
          assert CompilationFailureAction.getValue(initialOptions) == originalFailureAction;
      }
  }
--- 42,58 ----
   */
  public class CompileTheWorldTest extends GraalCompilerTest {
  
      @Test
      public void testJDK() throws Throwable {
!         boolean originalBailoutAction = CompilationBailoutAsFailure.getValue(getInitialOptions());
          ExceptionAction originalFailureAction = CompilationFailureAction.getValue(getInitialOptions());
          // Compile a couple classes in rt.jar
          HotSpotJVMCIRuntime runtime = HotSpotJVMCIRuntime.runtime();
          System.setProperty("CompileTheWorld.LimitModules", "java.base");
          OptionValues initialOptions = getInitialOptions();
          EconomicMap<OptionKey<?>, Object> compilationOptions = CompileTheWorld.parseOptions("Inline=false");
          new CompileTheWorld(runtime, (HotSpotGraalCompiler) runtime.getCompiler(), CompileTheWorld.SUN_BOOT_CLASS_PATH, 1, 5, null, null, false, initialOptions, compilationOptions).compile();
!         assert CompilationBailoutAsFailure.getValue(initialOptions) == originalBailoutAction;
          assert CompilationFailureAction.getValue(initialOptions) == originalFailureAction;
      }
  }