commit f11104e61e075a6fe50d75aa7cabca0fcdecfae5
author Stephan Herhut <herhut@google.com> Thu Aug 10 14:31:07 2017 +0200
committer Stephan Herhut <herhut@google.com> Thu Aug 10 14:31:07 2017 +0200
tree 69b904f76c21213c5fb4f9a03f4f120cbe4e7fbd
parent 13f68cf24fbdd7c080bc35d6995b7f7d6daaf1c8

Disable inlining for 625_checker_licm_regressions.

Bug:
Change-Id: I7d48e444709f548f3431d0f5dd03a2cb56deffe8

src/test/java/com/android/tools/r8/R8RunArtTestsTest.java

diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index 651bcd8..da561f8 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -761,7 +761,10 @@
       "534-checker-bce-deoptimization",
 
       // Requires something to be allocated in a method so that it goes out of scope.
-      "059-finalizer-throw"
+      "059-finalizer-throw",
+
+      // Has tests in submethods, which we should not inline.
+      "625-checker-licm-regressions"
   );
 
   private static List<String> failuresToTriage = ImmutableList.of(
@@ -1091,49 +1094,47 @@
       throws IOException, ProguardRuleParserException, ExecutionException, CompilationException {
     assert mode != null;
     switch (compilerUnderTest) {
-      case D8:
-        {
-          assert keepRulesFile == null : "Keep-rules file specified for D8.";
-          D8Command.Builder builder =
-              D8Command.builder()
-                  .setMode(mode)
-                  .addProgramFiles(ListUtils.map(fileNames, Paths::get));
-          Integer minSdkVersion = needMinSdkVersion.get(name);
-          if (minSdkVersion != null) {
-            builder.setMinApiLevel(minSdkVersion);
-          }
-          D8Output output = D8.run(builder.build());
-          output.write(Paths.get(resultPath));
-          break;
+      case D8: {
+        assert keepRulesFile == null : "Keep-rules file specified for D8.";
+        D8Command.Builder builder =
+            D8Command.builder()
+                .setMode(mode)
+                .addProgramFiles(ListUtils.map(fileNames, Paths::get));
+        Integer minSdkVersion = needMinSdkVersion.get(name);
+        if (minSdkVersion != null) {
+          builder.setMinApiLevel(minSdkVersion);
         }
-      case R8:
-        {
-          R8Command.Builder builder =
-              R8Command.builder()
-                  .setMode(mode)
-                  .setOutputPath(Paths.get(resultPath))
-                  .addProgramFiles(ListUtils.map(fileNames, Paths::get))
-                  .setIgnoreMissingClasses(true);
-          Integer minSdkVersion = needMinSdkVersion.get(name);
-          if (minSdkVersion != null) {
-            builder.setMinApiLevel(minSdkVersion);
-          }
-          if (keepRulesFile != null) {
-            builder.addProguardConfigurationFiles(Paths.get(keepRulesFile));
-          }
-          // Add internal flags for testing purposes.
-          ToolHelper.runR8(
-              builder.build(),
-              options -> {
-                if (enableInterfaceMethodDesugaring.contains(name)) {
-                  options.interfaceMethodDesugaring = OffOrAuto.Auto;
-                }
-                if (disableInlining) {
-                  options.inlineAccessors = false;
-                }
-              });
-          break;
+        D8Output output = D8.run(builder.build());
+        output.write(Paths.get(resultPath));
+        break;
+      }
+      case R8: {
+        R8Command.Builder builder =
+            R8Command.builder()
+                .setMode(mode)
+                .setOutputPath(Paths.get(resultPath))
+                .addProgramFiles(ListUtils.map(fileNames, Paths::get))
+                .setIgnoreMissingClasses(true);
+        Integer minSdkVersion = needMinSdkVersion.get(name);
+        if (minSdkVersion != null) {
+          builder.setMinApiLevel(minSdkVersion);
         }
+        if (keepRulesFile != null) {
+          builder.addProguardConfigurationFiles(Paths.get(keepRulesFile));
+        }
+        // Add internal flags for testing purposes.
+        ToolHelper.runR8(
+            builder.build(),
+            options -> {
+              if (enableInterfaceMethodDesugaring.contains(name)) {
+                options.interfaceMethodDesugaring = OffOrAuto.Auto;
+              }
+              if (disableInlining) {
+                options.inlineAccessors = false;
+              }
+            });
+        break;
+      }
       default:
         assert false : compilerUnderTest;
     }