azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pseudocode: Do not generate VALUE_CONSUMER if property delegate has no value (EA-59276)

Browse Source
This commit is contained in:
Alexey Sedunov
2014-09-01 13:41:44 +04:00
parent e03bae44d9
commit f11621615b
6 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+7 -4
View File
@@ -1169,7 +1169,9 @@ public class JetControlFlowProcessor {
DeclarationDescriptor descriptor = trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, property);
if (!(descriptor instanceof PropertyDescriptor)) return;
List<PseudoValue> values = Collections.singletonList(builder.getBoundValue(delegate));
PseudoValue delegateValue = builder.getBoundValue(delegate);
if (delegateValue == null) return;
List<TypePredicate> typePredicates = KotlinPackage.map(
((PropertyDescriptor) descriptor).getAccessors(),
new Function1<PropertyAccessorDescriptor, TypePredicate>() {
@@ -1179,9 +1181,10 @@ public class JetControlFlowProcessor {
}
}
);
Map<PseudoValue, TypePredicate> valuesToTypePredicates =
PseudocodePackage.expectedTypeFor(PseudocodePackage.and(typePredicates), values);
builder.magic(property, null, values, valuesToTypePredicates, MagicKind.VALUE_CONSUMER);
Map<PseudoValue, TypePredicate> valuesToTypePredicates = SmartFMap
.<PseudoValue, TypePredicate>emptyMap()
.plus(delegateValue, PseudocodePackage.and(typePredicates));
builder.magic(property, null, Collections.singletonList(delegateValue), valuesToTypePredicates, MagicKind.VALUE_CONSUMER);
}
private TypePredicate getTypePredicateByReceiverValue(@Nullable ResolvedCall<?> resolvedCall) {