commit 6f328552b0398f71a96ecbb060dd2f30e48a14b2
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Jun 22 09:53:46 2023 +0200
committer Christoffer Adamsen <christofferqa@google.com> Thu Jun 22 08:16:05 2023 +0000
tree 82877528d4428b9e3dd95244c089f77a9ee319c9
parent b7240fa56b22f07dbe63b3135abe5de87022ceb6

Minor updates to fix test failures after default access modification

Change-Id: If36e5ab6d765089890e452db8eff672e0a2480fe

src/main/java/com/android/tools/r8/graph/UseRegistry.java

diff --git a/src/main/java/com/android/tools/r8/graph/UseRegistry.java b/src/main/java/com/android/tools/r8/graph/UseRegistry.java
index 02078ee..1d9e498 100644
--- a/src/main/java/com/android/tools/r8/graph/UseRegistry.java
+++ b/src/main/java/com/android/tools/r8/graph/UseRegistry.java
@@ -254,6 +254,9 @@
               || arg.isDexValueDouble()
               || arg.isDexValueString();
       }
+      if (continuation.shouldBreak()) {
+        break;
+      }
     }
   }
 

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 cc8d4fe..19e91a5 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -1189,6 +1189,11 @@
           ImmutableList.of("-dontwarn junit.framework.**"),
           "100-reflect2",
           ImmutableList.of(NO_CLASS_ACCESS_MODIFICATION_RULE),
+          "301-abstract-protected",
+          ImmutableList.of(
+              "-keepclassmembers,allowobfuscation,allowoptimization,allowshrinking class Abstract {"
+                  + "  protected abstract java.lang.String m();"
+                  + "}"),
           "435-new-instance",
           ImmutableList.of(NO_CLASS_ACCESS_MODIFICATION_RULE),
           // Constructor MakeBoundType.<init>(int) is called using reflection.

src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java
index 695849f..2007fa0 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java
@@ -107,7 +107,7 @@
                 getTestName(), "MainKt$test2$$inlined$process$3"),
             lambdasInInput.getKStyleLambdaReferenceFromTypeName(
                 getTestName(), "MainKt$test2$$inlined$process$4"));
-    if (allowAccessModification) {
+    if (parameters.isAccessModificationEnabled(allowAccessModification)) {
       kStyleLambdaMergeGroup.add(
           lambdasInInput.getKStyleLambdaReferenceFromTypeName(
               getTestName(), "MainKt$test2$lambda$1"));

src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java
index 2dc729e..580b42c 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java
@@ -93,7 +93,7 @@
     assertEquals(0, lambdasInInput.getNumberOfJStyleLambdas());
     assertEquals(28, lambdasInInput.getNumberOfKStyleLambdas());
 
-    if (!allowAccessModification) {
+    if (!parameters.isAccessModificationEnabled(allowAccessModification)) {
       // Only a subset of all K-style Kotlin lambdas are merged without -allowaccessmodification.
       Set<ClassReference> unmergedLambdas =
           ImmutableSet.of(

src/test/java/com/android/tools/r8/repackage/RepackageWithStringIdentifier.java

diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithStringIdentifier.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithStringIdentifier.java
index 3f8e0bb..608b53c 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithStringIdentifier.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithStringIdentifier.java
@@ -8,6 +8,7 @@
 
 import com.android.tools.r8.NeverClassInline;
 import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.NoAccessModification;
 import com.android.tools.r8.TestParameters;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,6 +48,7 @@
         .addKeepMainRule(Main.class)
         .enableInliningAnnotations()
         .enableNeverClassInliningAnnotations()
+        .enableNoAccessModificationAnnotationsForClasses()
         .setMinApi(parameters)
         .compile()
         .inspect(inspector -> assertThat(A.class, isRepackaged(inspector)))
@@ -55,6 +57,7 @@
   }
 
   @NeverClassInline
+  @NoAccessModification
   static class A {
 
     @NeverInline