test/compiler/testlibrary/rtm/RTMTestBase.java

*** 236,249 ****
  
          filters[filters.length - 1] = "RTM";
          String[] filteredVMOpts = Utils.getFilteredTestJavaOpts(filters);
          Collections.addAll(finalVMOpts, filteredVMOpts);
          Collections.addAll(finalVMOpts, "-Xcomp", "-server",
!                 "-XX:-TieredCompilation",
                  CommandLineOptionTest.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
!                 "-XX:+UseRTMLocking");
  
          if (test != null) {
              for (String method : test.getMethodsToCompileNames()) {
                  finalVMOpts.add("-XX:CompileCommand=compileonly," + method);
              }
--- 236,249 ----
  
          filters[filters.length - 1] = "RTM";
          String[] filteredVMOpts = Utils.getFilteredTestJavaOpts(filters);
          Collections.addAll(finalVMOpts, filteredVMOpts);
          Collections.addAll(finalVMOpts, "-Xcomp", "-server",
!                 "-XX:-TieredCompilation", "-XX:+UseRTMLocking",
                  CommandLineOptionTest.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
!                 "-Xbootclasspath/a:.", "-XX:+WhiteBoxAPI");
  
          if (test != null) {
              for (String method : test.getMethodsToCompileNames()) {
                  finalVMOpts.add("-XX:CompileCommand=compileonly," + method);
              }