commit de6c0cb6769a7fc590bb6912624e5fa13c4dfcca
author Ian Zerny <zerny@google.com> Thu Aug 19 11:15:17 2021 +0200
committer Ian Zerny <zerny@google.com> Thu Aug 19 11:15:17 2021 +0200
tree d872c304a7e725b450b3f76e1e6c952f1a59a1b7
parent dd26ff178c33e32396be00ba7484fe39e2141d20

Don't add preamble position if one is found before first instruction.

Change-Id: I067834cb5cc8d2f69386dbab8d9c4534fc6505c4

src/main/java/com/android/tools/r8/graph/CfCode.java

diff --git a/src/main/java/com/android/tools/r8/graph/CfCode.java b/src/main/java/com/android/tools/r8/graph/CfCode.java
index 0213b0e..0a7c0e5 100644
--- a/src/main/java/com/android/tools/r8/graph/CfCode.java
+++ b/src/main/java/com/android/tools/r8/graph/CfCode.java
@@ -741,15 +741,20 @@
       firstLabel = new CfLabel();
       newInstructions.add(firstLabel);
     }
-    newInstructions.add(new CfPosition(firstLabel, callerPosition));
+    boolean seenPosition = false;
     for (CfInstruction instruction : instructions) {
       if (instruction.isPosition()) {
+        seenPosition = true;
         CfPosition oldPosition = instruction.asPosition();
         newInstructions.add(
             new CfPosition(
                 oldPosition.getLabel(),
                 oldPosition.getPosition().withOutermostCallerPosition(callerPosition)));
       } else {
+        if (!instruction.isLabel() && !seenPosition) {
+          newInstructions.add(new CfPosition(firstLabel, callerPosition));
+          seenPosition = true;
+        }
         newInstructions.add(instruction);
       }
     }