From 267ea81bbeb996e337e2518615c2f84b998a580d Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 17 Jul 2014 16:27:08 +0400 Subject: [PATCH] Pseudocode: Avoid null input values --- .../org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 3f18b1498f8..9ef8379c799 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -905,8 +905,10 @@ public class JetControlFlowProcessor { PseudoValue value = builder.magic( loopRange != null ? loopRange : expression, null, - Collections.singletonList(loopRangeValue), - Collections.singletonMap(loopRangeValue, loopRangeTypePredicate), + ContainerUtil.createMaybeSingletonList(loopRangeValue), + loopRangeValue != null + ? Collections.singletonMap(loopRangeValue, loopRangeTypePredicate) + : Collections.emptyMap(), MagicKind.LOOP_RANGE_ITERATION ).getOutputValue();