commit 6253c209ead7f13cebb5f6e117d506d0d8135dfe
author Christoffer Quist Adamsen <christofferqa@google.com> Sun Aug 04 11:24:35 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Sun Aug 04 11:24:35 2019 +0200
tree bab5bfcfff85230f34dcfe4b3364097721c61fe5
parent 3592a44ed96cf3f893e79d8584e2120d01773dd9

Update assertion leading to "Cannot substitute type on NULL reference"

Change-Id: Idc06a3b94f226dd734c497ddb12f5cd8fabc5674

src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java b/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
index a02bf6c..8c40d92 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
@@ -465,6 +465,7 @@
           assert !affectedPhis.contains(operandPhi) || operandType.isBottom();
           assert affectedPhis.contains(operandPhi)
               || operandType.isPrimitive()
+              || operandType.isNullType()
               || (operandType.isReference()
                   && operandType.asReferenceTypeLatticeElement().substitute(graphLense, appView)
                       == operandType);