commit 3b57611528bec2452a3fd6d08ff3e587b9004b28
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Apr 25 07:10:46 2022 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Apr 25 07:10:46 2022 +0200
tree c6b71241e592cc10214bf75031e36ffa14125dd3
parent 9470d9e679f060b071ca468ff2dad062fb7a1498

Fix bad build

Change-Id: Ic4561e15c57dbc4fea6ff74b7837583f236a5e06

src/main/java/com/android/tools/r8/optimize/interfaces/analysis/ConcreteCfFrameState.java

diff --git a/src/main/java/com/android/tools/r8/optimize/interfaces/analysis/ConcreteCfFrameState.java b/src/main/java/com/android/tools/r8/optimize/interfaces/analysis/ConcreteCfFrameState.java
index 3cd6b6e..63654b3 100644
--- a/src/main/java/com/android/tools/r8/optimize/interfaces/analysis/ConcreteCfFrameState.java
+++ b/src/main/java/com/android/tools/r8/optimize/interfaces/analysis/ConcreteCfFrameState.java
@@ -13,6 +13,7 @@
 import com.android.tools.r8.graph.DexType;
 import com.android.tools.r8.graph.ProgramMethod;
 import it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap;
 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -38,7 +39,7 @@
     if (uninitializedType.isInitialized()) {
       return error();
     }
-    for (Int2ObjectSortedMap.Entry<FrameType> entry : locals.int2ObjectEntrySet()) {
+    for (Int2ObjectMap.Entry<FrameType> entry : locals.int2ObjectEntrySet()) {
       FrameType frameType = entry.getValue();
       FrameType initializedFrameType =
           getInitializedFrameType(uninitializedType, frameType, initializedType);

src/main/java/com/android/tools/r8/utils/BoxBase.java

diff --git a/src/main/java/com/android/tools/r8/utils/BoxBase.java b/src/main/java/com/android/tools/r8/utils/BoxBase.java
index a3ee4e0..d38d92b 100644
--- a/src/main/java/com/android/tools/r8/utils/BoxBase.java
+++ b/src/main/java/com/android/tools/r8/utils/BoxBase.java
@@ -26,7 +26,7 @@
     if (!isSet()) {
       set(supplier.get());
     }
-    return get();
+    return value;
   }
 
   T get() {