commit 75d734277e0187c91e76e7965d06454715c8e4c3
author Ian Zerny <zerny@google.com> Thu Jan 14 16:29:11 2021 +0000
committer Ian Zerny <zerny@google.com> Thu Jan 14 16:29:23 2021 +0000
tree 04a7ed985e852abd33a44f4be3211fdeebdd2761
parent 9f85fa9d92492aed7a4318241662da15a1e1eb37

Revert "No NullOrAbstractValue for primitive"

This reverts commit 4c41bbee8b4162925af5893f9fe9c8c3dbd52b79.

Reason for revert: Failures on bots

Change-Id: I77b53ecba0ae6b1d95b6164622e84cb92e693500

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 93e0308..2bf329d 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,15 +17,7 @@
   }
 
   public static AbstractValue create(AbstractValue value) {
-    if (value.isBottom()
-        || value.isUnknown()
-        || value.isNull()
-        || value.isNullOrAbstractValue()
-        || value.isSingleNumberValue()) {
-      return value;
-    }
-    if (value.isSingleFieldValue()
-        && value.asSingleFieldValue().getField().type.isPrimitiveType()) {
+    if (value.isBottom() || value.isUnknown() || value.isNull() || value.isNullOrAbstractValue()) {
       return value;
     }
     return new NullOrAbstractValue(value);