Remove requirement for attributes signature and innerclasses
Bug: 186630805
Change-Id: I049d76e2404a8f2c4e6c92f309729e7bc38c1c82
diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardKeepAttributes.java b/src/main/java/com/android/tools/r8/shaking/ProguardKeepAttributes.java
index 0dcf1eb..e47ff67 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardKeepAttributes.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardKeepAttributes.java
@@ -152,9 +152,6 @@
} else if (!innerClasses && enclosingMethod) {
throw new CompilationError("Attribute EnclosingMethod requires InnerClasses attribute. "
+ "Check -keepattributes directive.");
- } else if (signature && !innerClasses) {
- throw new CompilationError("Attribute Signature requires InnerClasses attribute. Check "
- + "-keepattributes directive.");
}
if (forceProguardCompatibility && localVariableTable && !lineNumberTable) {
// If locals are kept, assume line numbers should be kept too.
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureEnclosingTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureEnclosingTest.java
index d185d2d..5eccad7 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureEnclosingTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureEnclosingTest.java
@@ -4,13 +4,19 @@
package com.android.tools.r8.graph.genericsignature;
-import static com.android.tools.r8.DiagnosticsMatcher.diagnosticMessage;
-import static org.hamcrest.CoreMatchers.containsString;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
-import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.graph.genericsignature.GenericSignatureEnclosingTest.Bar.Inner;
+import com.android.tools.r8.graph.genericsignature.GenericSignatureEnclosingTest.Bar.SubInner;
import com.android.tools.r8.utils.BooleanUtils;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.android.tools.r8.utils.codeinspector.CodeInspector;
import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,6 +28,7 @@
private final TestParameters parameters;
private final boolean isCompat;
+ private final String objectDescriptor = "Ljava/lang/Object;";
@Parameters(name = "{0}, isCompat: {1}")
public static List<Object[]> data() {
@@ -34,25 +41,52 @@
this.isCompat = isCompat;
}
- @Test(expected = CompilationFailedException.class)
+ @Test()
public void testR8() throws Exception {
(isCompat ? testForR8Compat(parameters.getBackend()) : testForR8(parameters.getBackend()))
.addInnerClasses(getClass())
- .addKeepClassAndMembersRules(Foo.class, Bar.class)
+ .addKeepClassAndMembersRules(Foo.class, Bar.class, Bar.Inner.class, Bar.SubInner.class)
.addKeepMainRule(Main.class)
- // TODO(b/186630805): We should be able to compile with signature and not inner classes.
+ .addKeepClassRules(Foo.class)
.addKeepAttributeSignature()
.setMinApi(parameters.getApiLevel())
- // When this test can compile, we should assert that the generic signatures for Bar$1 and
- // Bar$2 are not on enclosing form, even though Bar is kept.
- .compileWithExpectedDiagnostics(
- diagnostics -> {
- diagnostics.assertErrorThatMatches(
- diagnosticMessage(
- containsString("Attribute Signature requires InnerClasses attribute")));
+ .addOptionsModification(
+ options -> {
+ options.horizontalClassMergerOptions().disable();
+ })
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines(
+ "Bar::enclosingMethod", "Hello World", "Bar::enclosingMethod2", "Hello World")
+ .inspect(
+ inspector -> {
+ inspectEnclosingClass(inspector, "$1", descriptor(Main.class));
+ inspectEnclosingClass(inspector, "$2", objectDescriptor);
+
+ ClassSubject inner = inspector.clazz(Inner.class);
+ assertThat(inner, isPresent());
+ assertTrue(inner.getDexProgramClass().getInnerClasses().isEmpty());
+ assertEquals(
+ "<T:" + objectDescriptor + ">" + objectDescriptor,
+ inner.getFinalSignatureAttribute());
+
+ ClassSubject subInner = inspector.clazz(SubInner.class);
+ assertThat(subInner, isPresent());
+ assertTrue(subInner.getDexProgramClass().getInnerClasses().isEmpty());
+ assertEquals(
+ "L" + binaryName(Bar.Inner.class) + "<Ljava/lang/String;>;",
+ subInner.getFinalSignatureAttribute());
});
}
+ private void inspectEnclosingClass(CodeInspector inspector, String suffix, String secondArg) {
+ ClassSubject enclosing = inspector.clazz(Bar.class.getTypeName() + suffix);
+ assertThat(enclosing, isPresent());
+ assertNull(enclosing.getDexProgramClass().getEnclosingMethodAttribute());
+ assertEquals(
+ isCompat ? "L" + binaryName(Foo.class) + "<Ljava/lang/Object;" + secondArg + ">;" : null,
+ enclosing.getFinalSignatureAttribute());
+ }
+
public abstract static class Foo<T, R> {
R foo(T r) {
@@ -61,7 +95,11 @@
}
}
- public static class Bar {
+ public static class Bar<S> {
+
+ public class Inner<T> {}
+
+ public class SubInner extends Bar<Integer>.Inner<String> {}
public static <T, R extends Main> Foo<T, R> enclosingMethod() {
return new Foo<T, R>() {
