Version: 3.0.41-sc01
Bug: 191248536
Bug: 190631723
Change-Id: Ibda27d2f665e968a775bbf15b56209ecfb75f73d
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 78c5d31..b6cfcbc 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 = "3.0.41-sc00";
+ public static final String LABEL = "3.0.41-sc01";
private Version() {
}
diff --git a/src/test/java/com/android/tools/r8/utils/codeinspector/AbsentClassSubject.java b/src/test/java/com/android/tools/r8/utils/codeinspector/AbsentClassSubject.java
index 0e2de72f..402d6b3 100644
--- a/src/test/java/com/android/tools/r8/utils/codeinspector/AbsentClassSubject.java
+++ b/src/test/java/com/android/tools/r8/utils/codeinspector/AbsentClassSubject.java
@@ -5,7 +5,7 @@
package com.android.tools.r8.utils.codeinspector;
import com.android.tools.r8.errors.Unreachable;
-import com.android.tools.r8.graph.AccessFlags;
+import com.android.tools.r8.graph.ClassAccessFlags;
import com.android.tools.r8.graph.DexMethod;
import com.android.tools.r8.graph.DexProgramClass;
import com.android.tools.r8.naming.ClassNamingForNameMapper;
@@ -115,7 +115,7 @@
}
@Override
- public AccessFlags<?> getAccessFlags() {
+ public ClassAccessFlags getAccessFlags() {
throw new Unreachable("Absent class has no access flags");
}
diff --git a/src/test/java/com/android/tools/r8/utils/codeinspector/ClassSubject.java b/src/test/java/com/android/tools/r8/utils/codeinspector/ClassSubject.java
index f614059..0a4f65a 100644
--- a/src/test/java/com/android/tools/r8/utils/codeinspector/ClassSubject.java
+++ b/src/test/java/com/android/tools/r8/utils/codeinspector/ClassSubject.java
@@ -6,6 +6,7 @@
import static com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.COMPANION_CLASS_NAME_SUFFIX;
+import com.android.tools.r8.graph.ClassAccessFlags;
import com.android.tools.r8.graph.DexMethod;
import com.android.tools.r8.graph.DexProgramClass;
import com.android.tools.r8.naming.ClassNamingForNameMapper;
@@ -167,6 +168,9 @@
return null;
}
+ @Override
+ public abstract ClassAccessFlags getAccessFlags();
+
public abstract boolean isAbstract();
public abstract boolean isAnnotation();
diff --git a/src/test/java/com/android/tools/r8/utils/codeinspector/FoundClassSubject.java b/src/test/java/com/android/tools/r8/utils/codeinspector/FoundClassSubject.java
index 859f58f..4ac4f95 100644
--- a/src/test/java/com/android/tools/r8/utils/codeinspector/FoundClassSubject.java
+++ b/src/test/java/com/android/tools/r8/utils/codeinspector/FoundClassSubject.java
@@ -11,7 +11,7 @@
import com.android.tools.r8.TestRuntime.CfRuntime;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.ToolHelper.ProcessResult;
-import com.android.tools.r8.graph.AccessFlags;
+import com.android.tools.r8.graph.ClassAccessFlags;
import com.android.tools.r8.graph.DexAnnotation;
import com.android.tools.r8.graph.DexClass;
import com.android.tools.r8.graph.DexEncodedField;
@@ -356,7 +356,7 @@
}
@Override
- public AccessFlags<?> getAccessFlags() {
+ public ClassAccessFlags getAccessFlags() {
return getDexProgramClass().getAccessFlags();
}
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 5083d42..3e70473 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
@@ -5,6 +5,7 @@
package com.android.tools.r8.utils.codeinspector;
import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
import com.android.tools.r8.Collectors;
import com.android.tools.r8.errors.Unreachable;
@@ -101,6 +102,28 @@
};
}
+ public static Matcher<ClassSubject> isInterface() {
+ return new TypeSafeMatcher<ClassSubject>() {
+ @Override
+ public boolean matchesSafely(ClassSubject subject) {
+ return subject.isPresent() && subject.getAccessFlags().isInterface();
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("interface");
+ }
+
+ @Override
+ public void describeMismatchSafely(ClassSubject subject, Description description) {
+ description
+ .appendText(type(subject) + " ")
+ .appendValue(name(subject))
+ .appendText(" was not");
+ }
+ };
+ }
+
public static Matcher<Subject> isAbsent() {
return not(isPresent());
}
@@ -499,6 +522,22 @@
};
}
+ public static Matcher<ClassSubject> isImplementing(ClassSubject interfaceSubject) {
+ assertThat(interfaceSubject, isPresent());
+ assertThat(interfaceSubject, isInterface());
+ return new TypeSafeMatcher<ClassSubject>() {
+ @Override
+ public boolean matchesSafely(ClassSubject subject) {
+ return subject.isPresent() && subject.isImplementing(interfaceSubject);
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("implements ").appendText(interfaceSubject.getOriginalName());
+ }
+ };
+ }
+
public static Matcher<RetraceFrameResult> isInlineFrame() {
return new TypeSafeMatcher<RetraceFrameResult>() {
@Override
