From bfb70330eb7e34196f4c186edc2e0b2d797bce07 Mon Sep 17 00:00:00 2001 From: svtk Date: Wed, 2 Nov 2011 14:17:12 +0400 Subject: [PATCH] KT-423 Assertion error on incomplete code --- .../jet/lang/cfg/JetFlowInformationProvider.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java index 880270690c3..49f2bab7ae6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java @@ -332,8 +332,10 @@ public class JetFlowInformationProvider { @Override public Void visitProperty(JetProperty property, Void data) { DeclarationDescriptor descriptor = trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, property); - assert descriptor instanceof VariableDescriptor; - declaredVariables.add((VariableDescriptor) descriptor); + if (descriptor != null) { + assert descriptor instanceof VariableDescriptor; + declaredVariables.add((VariableDescriptor) descriptor); + } return null; } @@ -342,8 +344,10 @@ public class JetFlowInformationProvider { JetParameter loopParameter = expression.getLoopParameter(); if (loopParameter != null) { DeclarationDescriptor descriptor = trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, loopParameter); - assert descriptor instanceof VariableDescriptor; - declaredVariables.add((VariableDescriptor) descriptor); + if (descriptor != null) { + assert descriptor instanceof VariableDescriptor; + declaredVariables.add((VariableDescriptor) descriptor); + } } return null; }