commit b5990384eaaf0e59deb31031e7610f750969a2ed
author Clément Béra <clementbera@google.com> Thu Jun 17 07:22:54 2021 +0000
committer Clément Béra <clementbera@google.com> Thu Jun 17 07:22:54 2021 +0000
tree 3bed8ad1e24c6c18a08f8127d45c81f0f21c31a9
parent a12ac872edd6bb1886ad94a1cd683543cc2d9a8e

Fix BackportedMethod

- fix red tests

Change-Id: I7f283936526898beca173040c7f2b618161bf486

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 9291e1c..9413849 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
@@ -6813,7 +6813,6 @@
     CfLabel label4 = new CfLabel();
     CfLabel label5 = new CfLabel();
     CfLabel label6 = new CfLabel();
-    CfLabel label7 = new CfLabel();
     return new CfCode(
         method.holder,
         3,
@@ -6821,11 +6820,10 @@
         ImmutableList.of(
             label0,
             new CfLoad(ValueType.OBJECT, 0),
-            new CfIf(If.Type.NE, ValueType.OBJECT, label6),
+            new CfIf(If.Type.NE, ValueType.OBJECT, label5),
             label1,
             new CfLoad(ValueType.OBJECT, 1),
-            new CfIf(If.Type.EQ, ValueType.OBJECT, label3),
-            label2,
+            new CfIf(If.Type.EQ, ValueType.OBJECT, label2),
             new CfLoad(ValueType.OBJECT, 1),
             new CfInvoke(
                 185,
@@ -6835,8 +6833,8 @@
                     options.itemFactory.createString("get")),
                 true),
             new CfCheckCast(options.itemFactory.stringType),
-            new CfGoto(label4),
-            label3,
+            new CfGoto(label3),
+            label2,
             new CfFrame(
                 new Int2ReferenceAVLTreeMap<>(
                     new int[] {0, 1},
@@ -6847,7 +6845,7 @@
                     }),
                 new ArrayDeque<>(Arrays.asList())),
             new CfConstNull(),
-            label4,
+            label3,
             new CfFrame(
                 new Int2ReferenceAVLTreeMap<>(
                     new int[] {0, 1},
@@ -6859,7 +6857,7 @@
                 new ArrayDeque<>(
                     Arrays.asList(FrameType.initialized(options.itemFactory.stringType)))),
             new CfStore(ValueType.OBJECT, 2),
-            label5,
+            label4,
             new CfNew(options.itemFactory.createType("Ljava/lang/NullPointerException;")),
             new CfStackInstruction(CfStackInstruction.Opcode.Dup),
             new CfLoad(ValueType.OBJECT, 2),
@@ -6872,7 +6870,7 @@
                     options.itemFactory.createString("<init>")),
                 false),
             new CfThrow(),
-            label6,
+            label5,
             new CfFrame(
                 new Int2ReferenceAVLTreeMap<>(
                     new int[] {0, 1},
@@ -6884,7 +6882,7 @@
                 new ArrayDeque<>(Arrays.asList())),
             new CfLoad(ValueType.OBJECT, 0),
             new CfReturn(ValueType.OBJECT),
-            label7),
+            label6),
         ImmutableList.of(),
         ImmutableList.of());
   }