commit 4c41bbee8b4162925af5893f9fe9c8c3dbd52b79
author Clément Béra <clementbera@google.com> Tue Jan 12 15:21:47 2021 +0000
committer Clément Béra <clementbera@google.com> Thu Jan 14 13:10:18 2021 +0000
tree 4b38e8b27e924a7603537e66130d08350d33e295
parent f637b908436d2cdeb457ad0bfc666798e9c39f0a

No NullOrAbstractValue for primitive

Bug: 176159606
Change-Id: I3e4c71fb3907727d04d9248abe9cf370a169bcc3

src/main/java/com/android/tools/r8/ir/analysis/value/NullOrAbstractValue.java

diff --git a/src/main/java/com/android/tools/r8/ir/analysis/value/NullOrAbstractValue.java b/src/main/java/com/android/tools/r8/ir/analysis/value/NullOrAbstractValue.java
index 2bf329d..93e0308 100644
--- a/src/main/java/com/android/tools/r8/ir/analysis/value/NullOrAbstractValue.java
+++ b/src/main/java/com/android/tools/r8/ir/analysis/value/NullOrAbstractValue.java
@@ -17,7 +17,15 @@
   }
 
   public static AbstractValue create(AbstractValue value) {
-    if (value.isBottom() || value.isUnknown() || value.isNull() || value.isNullOrAbstractValue()) {
+    if (value.isBottom()
+        || value.isUnknown()
+        || value.isNull()
+        || value.isNullOrAbstractValue()
+        || value.isSingleNumberValue()) {
+      return value;
+    }
+    if (value.isSingleFieldValue()
+        && value.asSingleFieldValue().getField().type.isPrimitiveType()) {
       return value;
     }
     return new NullOrAbstractValue(value);