Version 1.4.61
Cherry pick: Allow use of ellipsis in non-argument positions in Proguard rules
CL: https://r8-review.googlesource.com/c/r8/+/34884
Bug: 126443924
Change-Id: I4574ed65cf7ac2ac6213b64a040f3bdad9f97651
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index f26dab4..e695edd 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
// This field is accessed from release scripts using simple pattern matching.
// Therefore, changing this field could break our release scripts.
- public static final String LABEL = "1.4.60";
+ public static final String LABEL = "1.4.61";
private Version() {
}
diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardTypeMatcher.java b/src/main/java/com/android/tools/r8/shaking/ProguardTypeMatcher.java
index 996f83f..e90da53 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardTypeMatcher.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardTypeMatcher.java
@@ -168,7 +168,7 @@
@Override
public boolean matches(DexType type) {
- throw new IllegalStateException();
+ return true;
}
@Override
diff --git a/src/test/java/com/android/tools/r8/proguard/configuration/ProguardRuleWithEllipsisForReturnTypeTest.java b/src/test/java/com/android/tools/r8/proguard/configuration/ProguardRuleWithEllipsisForReturnTypeTest.java
new file mode 100644
index 0000000..236f836
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/proguard/configuration/ProguardRuleWithEllipsisForReturnTypeTest.java
@@ -0,0 +1,64 @@
+// Copyright (c) 2019, 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.proguard.configuration;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.junit.Assert.assertThat;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.utils.StringUtils;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.android.tools.r8.utils.codeinspector.CodeInspector;
+import org.junit.Test;
+
+public class ProguardRuleWithEllipsisForReturnTypeTest extends TestBase {
+
+ private static final Class<?> clazz = ProguardRuleWithEllipsisForReturnTypeTestClass.class;
+ private static final String expectedOutput = StringUtils.lines("Hello world!");
+
+ @Test
+ public void testR8() throws Exception {
+ testForR8(Backend.DEX)
+ .addProgramClasses(clazz)
+ .addKeepRules(
+ "-keep class " + clazz.getTypeName() + " {",
+ " private static ... unused;",
+ " public static ... main(...);",
+ "}")
+ .run(clazz)
+ .assertSuccessWithOutput(expectedOutput)
+ .inspect(this::inspect);
+ }
+
+ @Test
+ public void testProguard() throws Exception {
+ testForProguard()
+ .addProgramClasses(clazz)
+ .addKeepRules(
+ "-keep class " + clazz.getTypeName() + " {",
+ " private static ... unused;",
+ " public static ... main(...);",
+ "}")
+ .run(clazz)
+ .assertSuccessWithOutput(expectedOutput)
+ .inspect(this::inspect);
+ }
+
+ private void inspect(CodeInspector inspector) {
+ ClassSubject classSubject = inspector.clazz(clazz);
+ assertThat(classSubject, isPresent());
+ assertThat(classSubject.uniqueFieldWithName("unused"), isPresent());
+ assertThat(classSubject.uniqueMethodWithName("main"), isPresent());
+ }
+}
+
+class ProguardRuleWithEllipsisForReturnTypeTestClass {
+
+ private static Object unused = new Object();
+
+ public static void main(String[] args) {
+ System.out.println("Hello world!");
+ }
+}
