From bccd2c49a5b6554d12c781fea689892c2bfadcb7 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Wed, 22 Jul 2020 11:45:09 +0700
Subject: [PATCH] IDEA-246334 Follow-up: do not use computeCastTo for null type

GitOrigin-RevId: 8aca68da4752e752cb92efd02503abbef7fd02da
---
 java/java-impl/src/com/intellij/slicer/DfaBasedFilter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/slicer/DfaBasedFilter.java b/java/java-impl/src/com/intellij/slicer/DfaBasedFilter.java
index 1bd4a38a84d7..e8ecd1a78f14 100644
--- a/java/java-impl/src/com/intellij/slicer/DfaBasedFilter.java
+++ b/java/java-impl/src/com/intellij/slicer/DfaBasedFilter.java
@@ -56,7 +56,8 @@ final class DfaBasedFilter {
       DfConstantType<?> dfConstantType = (DfConstantType<?>)myDfType;
       Object constValue = dfConstantType.getValue();
       if (!(constValue instanceof PsiElement)) {
-        Object value = TypeConversionUtil.computeCastTo(((PsiLiteralValue)element).getValue(), dfConstantType.getPsiType());
+        Object literalValue = ((PsiLiteralValue)element).getValue();
+        Object value = constValue == null ? literalValue : TypeConversionUtil.computeCastTo(literalValue, dfConstantType.getPsiType());
         return Objects.equals(value, constValue);
       }
     }