commit ed5226ebcca8663777670307e3520b556cee6bd4
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Jul 04 12:51:34 2022 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Jul 04 12:51:34 2022 +0200
tree ecefa1f5cbf2ab3ee54037f911c911cc993a8dd1
parent 1feae2c4489d84a638625608a4a50debae8d6bb1

Fix missing call to newInstances

Change-Id: Iaca68e69e1a7458dcdff3d197511250010dcd90f

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/string/StringBuilderNodeMuncher.java b/src/main/java/com/android/tools/r8/ir/optimize/string/StringBuilderNodeMuncher.java
index 0fe609e..3bf5773 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/string/StringBuilderNodeMuncher.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/string/StringBuilderNodeMuncher.java
@@ -225,11 +225,11 @@
       if (!currentNode.isToStringNode() || !currentNode.hasSinglePredecessor()) {
         return false;
       }
-      StringBuilderNode root = findFirstNonSentinelRoot(originalRoot);
-      if (!root.isNewInstanceNode() || !root.hasSingleSuccessor()) {
+      NewInstanceNode newInstanceNode = munchingState.getNewInstanceNode(originalRoot);
+      if (newInstanceNode == null || !newInstanceNode.hasSingleSuccessor()) {
         return false;
       }
-      InitOrAppendNode firstNode = root.getSingleSuccessor().asInitNode();
+      InitOrAppendNode firstNode = newInstanceNode.getSingleSuccessor().asInitNode();
       if (firstNode == null || !firstNode.hasSingleSuccessor()) {
         return false;
       }