From e274af7be854b7a79449eb5a520350f142bf93cb Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 8 Sep 2014 13:54:51 +0400 Subject: [PATCH] Pseudocode: Filter out nulls before combining type predicates #KT-5732 Fixed --- .../src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java index bd3a4b62392..58d11b7f078 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -1189,7 +1189,7 @@ public class JetControlFlowProcessor { ); Map valuesToTypePredicates = SmartFMap .emptyMap() - .plus(delegateValue, PseudocodePackage.and(typePredicates)); + .plus(delegateValue, PseudocodePackage.and(KotlinPackage.filterNotNull(typePredicates))); builder.magic(property, null, Collections.singletonList(delegateValue), valuesToTypePredicates, MagicKind.VALUE_CONSUMER); }