Add a test for rewriting horizontally merged classes in annotations
Change-Id: I88638cf560fa4f4c60b0eb67caef42b202fb6267
diff --git a/src/main/java/com/android/tools/r8/graph/DexAnnotationElement.java b/src/main/java/com/android/tools/r8/graph/DexAnnotationElement.java
index e1965be..237838f 100644
--- a/src/main/java/com/android/tools/r8/graph/DexAnnotationElement.java
+++ b/src/main/java/com/android/tools/r8/graph/DexAnnotationElement.java
@@ -17,6 +17,10 @@
this.value = value;
}
+ public DexValue getValue() {
+ return value;
+ }
+
@Override
public int hashCode() {
return name.hashCode() + value.hashCode() * 3;
diff --git a/src/main/java/com/android/tools/r8/graph/DexEncodedAnnotation.java b/src/main/java/com/android/tools/r8/graph/DexEncodedAnnotation.java
index 0ed6769..e480799 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedAnnotation.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedAnnotation.java
@@ -30,6 +30,14 @@
}
}
+ public DexAnnotationElement getElement(int i) {
+ return elements[i];
+ }
+
+ public int getNumberOfElements() {
+ return elements.length;
+ }
+
@Override
void collectMixedSectionItems(MixedSectionCollection mixedItems) {
// Should never be called.
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ReferencedInAnnotationTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ReferencedInAnnotationTest.java
new file mode 100644
index 0000000..6ce31b0
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ReferencedInAnnotationTest.java
@@ -0,0 +1,106 @@
+// Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.classmerging.horizontal;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static com.android.tools.r8.utils.codeinspector.Matchers.notIf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.android.tools.r8.NeverClassInline;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.graph.DexEncodedAnnotation;
+import com.android.tools.r8.graph.DexType;
+import com.android.tools.r8.graph.DexValue;
+import com.android.tools.r8.utils.codeinspector.AnnotationSubject;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.android.tools.r8.utils.codeinspector.CodeInspector;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.Test;
+
+public class ReferencedInAnnotationTest extends HorizontalClassMergingTestBase {
+
+ public ReferencedInAnnotationTest(
+ TestParameters parameters, boolean enableHorizontalClassMerging) {
+ super(parameters, enableHorizontalClassMerging);
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(getClass())
+ .addKeepMainRule(TestClass.class)
+ .addKeepClassAndMembersRules(Annotation.class)
+ .addOptionsModification(
+ options -> options.enableHorizontalClassMerging = enableHorizontalClassMerging)
+ .addKeepRuntimeVisibleAnnotations()
+ .enableNeverClassInliningAnnotations()
+ .setMinApi(parameters.getApiLevel())
+ .run(parameters.getRuntime(), TestClass.class)
+ .assertSuccessWithOutputLines("Hello world!")
+ .inspect(this::inspect);
+ }
+
+ private void inspect(CodeInspector inspector) {
+ // B should have been merged into A.
+ assertThat(inspector.clazz(B.class), notIf(isPresent(), enableHorizontalClassMerging));
+
+ // A and TestClass should still be present.
+ ClassSubject aClassSubject = inspector.clazz(A.class);
+ assertThat(aClassSubject, isPresent());
+
+ ClassSubject testClassSubject = inspector.clazz(TestClass.class);
+ assertThat(testClassSubject, isPresent());
+
+ // The annotation on TestClass should now refer to A instead of B.
+ AnnotationSubject annotationSubject =
+ testClassSubject.annotation(Annotation.class.getTypeName());
+ assertThat(annotationSubject, isPresent());
+
+ DexEncodedAnnotation encodedAnnotation = annotationSubject.getAnnotation();
+ assertEquals(1, encodedAnnotation.getNumberOfElements());
+
+ DexValue annotationElementValue = encodedAnnotation.getElement(0).getValue();
+ assertTrue(annotationElementValue.isDexValueType());
+
+ DexType annotationElementValueType = annotationElementValue.asDexValueType().getValue();
+ assertEquals(aClassSubject.getDexProgramClass().getType(), annotationElementValueType);
+ }
+
+ @Annotation(B.class)
+ public static class TestClass {
+
+ public static void main(String[] args) {
+ new A();
+ new B("");
+ }
+ }
+
+ @Retention(RetentionPolicy.RUNTIME)
+ @Target({ElementType.TYPE})
+ @interface Annotation {
+ Class<?> value();
+ }
+
+ @NeverClassInline
+ public static class A {
+
+ public A() {
+ System.out.print("Hello");
+ }
+ }
+
+ @NeverClassInline
+ public static class B {
+
+ public B(String s) {
+ System.out.println(" world!");
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java b/src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java
index f3ca283..04f007b 100644
--- a/src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java
+++ b/src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java
@@ -4,6 +4,8 @@
package com.android.tools.r8.utils.codeinspector;
+import static org.hamcrest.CoreMatchers.not;
+
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.graph.AccessFlags;
import com.android.tools.r8.graph.DexClass;
@@ -660,4 +662,11 @@
return getClassName() + "." + getMethodName() + "(" + filename + ":" + originalPosition + ")";
}
}
+
+ public static <T> Matcher<T> notIf(Matcher<T> matcher, boolean condition) {
+ if (condition) {
+ return not(matcher);
+ }
+ return matcher;
+ }
}
