commit 5144e722d1ad5ce86653a1f7f526021af19bf2af
author Morten Krogh-Jespersen <mkroghj@google.com> Tue May 16 10:34:26 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue May 16 10:34:26 2023 +0200
tree 43d67ae753a3eb80650d71537ee766629ad677dc
parent 4d08e6871bfda4b727253e16b9609e5066e9ef02

Ensure nodes to roots are correct and present in StringBuilder graphs

Change-Id: I6d3bd531c49e4cbbd561e5aba5d278ed6987c978

src/main/java/com/android/tools/r8/ir/optimize/string/StringBuilderAppendOptimizer.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/string/StringBuilderAppendOptimizer.java b/src/main/java/com/android/tools/r8/ir/optimize/string/StringBuilderAppendOptimizer.java
index dafdf5f..2798fb0 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/string/StringBuilderAppendOptimizer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/string/StringBuilderAppendOptimizer.java
@@ -471,10 +471,8 @@
                     }
                     assert currentTail != null;
                     // Link next node from successor
-                    if (childStates.size() != 1 || shouldAddNodeToGraph(currentTail, sbNode)) {
-                      currentTail.addSuccessor(sbNode);
-                      sbNode.addPredecessor(currentTail);
-                    }
+                    currentTail.addSuccessor(sbNode);
+                    sbNode.addPredecessor(currentTail);
                   });
               if (childState.seenAndNotProcessed()) {
                 childGraphState.isPartOfLoop = true;