commit c6912214093ba0758d935e94d2b5d42eeaee733e
author Søren Gjesse <sgjesse@google.com> Thu May 23 09:34:22 2024 +0200
committer Søren Gjesse <sgjesse@google.com> Thu May 23 09:34:22 2024 +0200
tree 6b78b2ee54b645c2fc4977ed32fcc26c162490af
parent f605f1bc9e6de9d409bc2eafe7bdd030d30e0378

Version 8.2.57

Fix git merge issue.

Change-Id: I768777987f447173d92e0bf90bc8d244b0c9cbe9

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 00c4e96..3a6e2bb 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -13,7 +13,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "8.2.56";
+  public static final String LABEL = "8.2.57";
 
   private Version() {
   }

src/main/java/com/android/tools/r8/ir/conversion/passes/NaturalIntLoopRemover.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/passes/NaturalIntLoopRemover.java b/src/main/java/com/android/tools/r8/ir/conversion/passes/NaturalIntLoopRemover.java
index a52a144..39f9e82 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/passes/NaturalIntLoopRemover.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/passes/NaturalIntLoopRemover.java
@@ -18,6 +18,7 @@
 import com.android.tools.r8.ir.conversion.passes.result.CodeRewriterResult;
 import com.android.tools.r8.ir.optimize.AffectedValues;
 import com.android.tools.r8.utils.WorkList;
+import com.google.common.collect.Sets;
 import java.util.Set;
 
 /**