commit 48b084cec33ce3c2e3ef9b4d292f5431e40cf5e1
author Søren Gjesse <sgjesse@google.com> Wed Oct 27 16:32:25 2021 +0200
committer Søren Gjesse <sgjesse@google.com> Wed Oct 27 16:32:25 2021 +0200
tree 62ae4d83cadaf14814ac00272f9a9d2d650eeca1
parent cbe8bc83a8baadd425883e4e5f70275b353e5075

Fix the generated code for the String.repeat backport

Java code was re-formatted before comitting, but generated code was not
updated.

Bug: 204183618
Change-Id: I5e0a7ecea65a3cd83cf7370b584d004ace496e9b

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 0e91f5d..b2fd06d 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
@@ -8357,6 +8357,7 @@
     CfLabel label13 = new CfLabel();
     CfLabel label14 = new CfLabel();
     CfLabel label15 = new CfLabel();
+    CfLabel label16 = new CfLabel();
     return new CfCode(
         method.holder,
         4,
@@ -8483,7 +8484,7 @@
             new CfConstNumber(2147483647, ValueType.INT),
             new CfLoad(ValueType.INT, 1),
             new CfArithmeticBinop(CfArithmeticBinop.Opcode.Div, NumericType.INT),
-            new CfIfCmp(If.Type.LE, ValueType.INT, label9),
+            new CfIfCmp(If.Type.LE, ValueType.INT, label10),
             label8,
             new CfNew(options.itemFactory.createType("Ljava/lang/OutOfMemoryError;")),
             new CfStackInstruction(CfStackInstruction.Opcode.Dup),
@@ -8506,6 +8507,7 @@
                     options.itemFactory.createString("append")),
                 false),
             new CfLoad(ValueType.OBJECT, 0),
+            label9,
             new CfInvoke(
                 182,
                 options.itemFactory.createMethod(
@@ -8566,7 +8568,7 @@
                     options.itemFactory.createString("<init>")),
                 false),
             new CfThrow(),
-            label9,
+            label10,
             new CfFrame(
                 new Int2ReferenceAVLTreeMap<>(
                     new int[] {0, 1, 2},
@@ -8590,10 +8592,10 @@
                     options.itemFactory.createString("<init>")),
                 false),
             new CfStore(ValueType.OBJECT, 3),
-            label10,
+            label11,
             new CfConstNumber(0, ValueType.INT),
             new CfStore(ValueType.INT, 4),
-            label11,
+            label12,
             new CfFrame(
                 new Int2ReferenceAVLTreeMap<>(
                     new int[] {0, 1, 2, 3, 4},
@@ -8607,8 +8609,8 @@
                 new ArrayDeque<>(Arrays.asList())),
             new CfLoad(ValueType.INT, 4),
             new CfLoad(ValueType.INT, 1),
-            new CfIfCmp(If.Type.GE, ValueType.INT, label14),
-            label12,
+            new CfIfCmp(If.Type.GE, ValueType.INT, label15),
+            label13,
             new CfLoad(ValueType.OBJECT, 3),
             new CfLoad(ValueType.OBJECT, 0),
             new CfInvoke(
@@ -8620,10 +8622,10 @@
                     options.itemFactory.createString("append")),
                 false),
             new CfStackInstruction(CfStackInstruction.Opcode.Pop),
-            label13,
-            new CfIinc(4, 1),
-            new CfGoto(label11),
             label14,
+            new CfIinc(4, 1),
+            new CfGoto(label12),
+            label15,
             new CfFrame(
                 new Int2ReferenceAVLTreeMap<>(
                     new int[] {0, 1, 2, 3},
@@ -8643,7 +8645,7 @@
                     options.itemFactory.createString("toString")),
                 false),
             new CfReturn(ValueType.OBJECT),
-            label15),
+            label16),
         ImmutableList.of(),
         ImmutableList.of());
   }