From 054e85338d62bb2551960a7cdc2463bbb0575598 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 28 Apr 2015 16:04:38 +0300 Subject: [PATCH] Fix for EA-68153 (incorrect nullability) --- .../org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 4c4384fd087..9e8828a77ad 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -1718,7 +1718,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { DelegationFieldsInfo.Field field = delegationFieldsInfo.getInfo((JetDelegatorByExpressionSpecifier) specifier); generateDelegateField(field); JetExpression delegateExpression = ((JetDelegatorByExpressionSpecifier) specifier).getDelegateExpression(); - JetType delegateExpressionType = bindingContext.getType(delegateExpression); + JetType delegateExpressionType = delegateExpression != null ? bindingContext.getType(delegateExpression) : null; generateDelegates(getSuperClass(specifier), delegateExpressionType, field); } }