Revert "Fix Red tests"
This reverts commit 352a2a6fbe9bab5609f5ba472db32ed7955e4590.
Reason for revert: failing tests (needed to revert parent)
Change-Id: Ie36000620ae3eab10a83a13f83f610d21a80bcbf
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
index 4336f61..4c820ff 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
@@ -236,10 +236,7 @@
this.lambdaRewriter = new LambdaRewriter(appView);
this.desugaredLibraryAPIConverter =
new DesugaredLibraryAPIConverter(appView, Mode.GENERATE_CALLBACKS_AND_WRAPPERS);
- this.backportedMethodRewriter =
- options.testing.forceLibBackportsInL8CfToCf
- ? new BackportedMethodRewriter(appView, this)
- : null;
+ this.backportedMethodRewriter = null;
this.twrCloseResourceRewriter = null;
this.lambdaMerger = null;
this.covariantReturnTypeAnnotationTransformer = null;
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
index e9a6faa..c56524e 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
@@ -297,14 +297,6 @@
private final Map<DexMethod, MethodProvider> rewritable = new IdentityHashMap<>();
RewritableMethods(InternalOptions options, AppView<?> appView) {
- if (options.testing.forceLibBackportsInL8CfToCf) {
- DexItemFactory factory = options.itemFactory;
- initializeJava9OptionalMethodProviders(factory);
- initializeJava10OptionalMethodProviders(factory);
- initializeJava11OptionalMethodProviders(factory);
- initializeStreamMethodProviders(factory);
- return;
- }
if (!options.shouldBackportMethods()) {
return;
}
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index c4481f5..ae119c2 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -1097,7 +1097,7 @@
public PrintStream whyAreYouNotInliningConsumer = System.out;
public boolean trackDesugaredAPIConversions =
System.getProperty("com.android.tools.r8.trackDesugaredAPIConversions") != null;
- public boolean forceLibBackportsInL8CfToCf = false;
+
// TODO(b/144781417): This is disabled by default as some test apps appear to have such classes.
public boolean allowNonAbstractClassesWithAbstractMethods = true;
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryTestBase.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryTestBase.java
index b68997a..628fbfe 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryTestBase.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryTestBase.java
@@ -82,7 +82,7 @@
// If we compile extended library here, it means we use TestNG.
// TestNG requires annotations, hence we disable AnnotationRemoval.
// This implies that extra warning are generated if this is set.
- boolean extraFiles = !additionalProgramFiles.isEmpty();
+ boolean disableL8AnnotationRemovalForTesting = !additionalProgramFiles.isEmpty();
ArrayList<Path> extraPaths = new ArrayList<>(additionalProgramFiles);
TestDiagnosticMessagesImpl diagnosticsHandler = new TestDiagnosticMessagesImpl();
Path desugaredLib = temp.newFolder().toPath().resolve("desugar_jdk_libs_dex.zip");
@@ -104,12 +104,11 @@
ToolHelper.runL8(
l8Builder.build(),
options -> {
- if (extraFiles) {
+ if (disableL8AnnotationRemovalForTesting) {
options.testing.disableL8AnnotationRemoval = true;
- options.testing.forceLibBackportsInL8CfToCf = true;
}
});
- if (!extraFiles) {
+ if (!disableL8AnnotationRemovalForTesting) {
assertTrue(
diagnosticsHandler.getInfos().stream()
.noneMatch(
