commit e51a71add4ed4209fecee468721a270762e6869c
author Morten Krogh-Jespersen <mkroghj@google.com> Tue May 16 11:05:21 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue May 16 11:05:21 2023 +0200
tree f75f0870aac2cd2c408f35701902c8266d653316
parent 14bf5c7d692fb2a2a05e1b9e479dc62a848e8165

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;