commit 7544d7efc12c017714fec49c9c53c6f1e42ac6a5
author Clément Béra <clementbera@google.com> Wed Mar 16 10:27:21 2022 +0000
committer Clément Béra <clementbera@google.com> Wed Mar 16 10:27:59 2022 +0000
tree f9798dcdc76d12097beee71e27f4050ce19fd27c
parent 682fca1858d6367257393ad6e9ed37fd6baa1732

Regenerate backport methods

Fix red bot

Change-Id: I29f5dfba6802e31c7f1120c4ef80447aa2847159

src/main/java/com/android/tools/r8/ir/desugar/backports/BackportedMethods.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/backports/BackportedMethods.java b/src/main/java/com/android/tools/r8/ir/desugar/backports/BackportedMethods.java
index e756163..1791282 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/backports/BackportedMethods.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/backports/BackportedMethods.java
@@ -8136,7 +8136,6 @@
   public static CfCode PredicateMethods_not(InternalOptions options, DexMethod method) {
     CfLabel label0 = new CfLabel();
     CfLabel label1 = new CfLabel();
-    CfLabel label2 = new CfLabel();
     return new CfCode(
         method.holder,
         1,
@@ -8145,17 +8144,6 @@
             label0,
             new CfLoad(ValueType.OBJECT, 0),
             new CfInvoke(
-                184,
-                options.itemFactory.createMethod(
-                    options.itemFactory.createType("Ljava/util/Objects;"),
-                    options.itemFactory.createProto(
-                        options.itemFactory.objectType, options.itemFactory.objectType),
-                    options.itemFactory.createString("requireNonNull")),
-                false),
-            new CfStackInstruction(CfStackInstruction.Opcode.Pop),
-            label1,
-            new CfLoad(ValueType.OBJECT, 0),
-            new CfInvoke(
                 185,
                 options.itemFactory.createMethod(
                     options.itemFactory.createType("Ljava/util/function/Predicate;"),
@@ -8164,7 +8152,7 @@
                     options.itemFactory.createString("negate")),
                 true),
             new CfReturn(ValueType.OBJECT),
-            label2),
+            label1),
         ImmutableList.of(),
         ImmutableList.of());
   }