commit 0081193404686cd7d75b6aa7fc58877f9f10c6ee
author Ian Zerny <zerny@google.com> Tue Mar 26 08:00:29 2019 +0100
committer Ian Zerny <zerny@google.com> Tue Mar 26 08:00:29 2019 +0100
tree 4c2290aebeb1f0e268cb52d0e0cad3f95257c4d8
parent cc2025b27b603df7011424e6a7569f0d11187b0e

Don't disable desugaring for the art tests.

Change-Id: If8b3ad9db605cd2678d45f258fc69da0000c4b9a

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 f3c728e..2af0c69 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -1214,6 +1214,8 @@
     private final boolean disableUninstantiatedTypeOptimization;
     // Has missing classes.
     private final boolean hasMissingClasses;
+    // Explicitly disable desugaring.
+    private final boolean disableDesugaring;
 
     TestSpecification(
         String name,
@@ -1231,7 +1233,8 @@
         boolean disableInlining,
         boolean disableClassInlining,
         boolean disableUninstantiatedTypeOptimization,
-        boolean hasMissingClasses) {
+        boolean hasMissingClasses,
+        boolean disableDesugaring) {
       this.name = name;
       this.dexTool = dexTool;
       this.nativeLibrary = nativeLibrary;
@@ -1248,6 +1251,7 @@
       this.disableClassInlining = disableClassInlining;
       this.disableUninstantiatedTypeOptimization = disableUninstantiatedTypeOptimization;
       this.hasMissingClasses = hasMissingClasses;
+      this.disableDesugaring = disableDesugaring;
     }
 
     TestSpecification(
@@ -1274,7 +1278,9 @@
           disableInlining,
           true, // Disable class inlining for JCTF tests.
           false,
-          false);
+          false,
+          true // Disable desugaring for JCTF tests.
+      );
     }
 
     TestSpecification(
@@ -1300,7 +1306,9 @@
           disableInlining,
           true, // Disable class inlining for JCTF tests.
           false,
-          false);
+          false,
+          true // Disable desugaring for JCTF tests.
+      );
     }
 
     public File resolveFile(String name) {
@@ -1466,7 +1474,8 @@
                 requireInliningToBeDisabled.contains(name),
                 requireClassInliningToBeDisabled.contains(name),
                 requireUninstantiatedTypeOptimizationToBeDisabled.contains(name),
-                hasMissingClasses.contains(name)));
+                hasMissingClasses.contains(name),
+                false));
       }
     }
     return data;
@@ -1534,12 +1543,14 @@
     private final boolean disableClassInlining;
     private final boolean disableUninstantiatedTypeOptimization;
     private final boolean hasMissingClasses;
+    private final boolean disableDesugaring;
 
     private CompilationOptions(TestSpecification spec) {
       this.disableInlining = spec.disableInlining;
       this.disableClassInlining = spec.disableClassInlining;
       this.disableUninstantiatedTypeOptimization = spec.disableUninstantiatedTypeOptimization;
       this.hasMissingClasses = spec.hasMissingClasses;
+      this.disableDesugaring = spec.disableDesugaring;
     }
 
     @Override
@@ -1688,7 +1699,7 @@
                   .setMode(mode)
                   .addProgramFiles(ListUtils.map(fileNames, Paths::get))
                   .setOutput(Paths.get(resultPath), OutputMode.DexIndexed)
-                  .setDisableDesugaring(true);
+                  .setDisableDesugaring(compilationOptions.disableDesugaring);
         AndroidApiLevel minSdkVersion = needMinSdkVersion.get(name);
         if (minSdkVersion != null) {
           builder.setMinApiLevel(minSdkVersion.getLevel());
@@ -1709,7 +1720,7 @@
                   .setMode(mode)
                   .setDisableTreeShaking(true)
                   .setDisableMinification(true)
-                  .setDisableDesugaring(true)
+                  .setDisableDesugaring(compilationOptions.disableDesugaring)
                   .addProguardConfiguration(ImmutableList.of("-keepattributes *"), Origin.unknown())
                   .setOutput(
                       Paths.get(resultPath),