From 5bf5dfc5a4b1f3d349586ba4b71eab479290bca2 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 9 Apr 2014 17:53:43 +0400 Subject: [PATCH] Use hasInitializer() instead of getInitializer() in DescriptorResolver --- .../org/jetbrains/jet/lang/resolve/DescriptorResolver.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index cee99b35509..8dd403212d1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -986,8 +986,7 @@ public class DescriptorResolver { boolean hasDelegate = variable instanceof JetProperty && ((JetProperty) variable).hasDelegateExpression(); if (propertyTypeRef == null) { - final JetExpression initializer = variable.getInitializer(); - if (initializer == null) { + if (!variable.hasInitializer()) { if (hasDelegate && variableDescriptor instanceof PropertyDescriptor) { final JetProperty property = (JetProperty) variable; final JetExpression propertyDelegateExpression = property.getDelegateExpression(); @@ -1017,7 +1016,7 @@ public class DescriptorResolver { new Function0() { @Override public JetType invoke() { - JetType initializerType = resolveInitializerType(scope, initializer, dataFlowInfo, trace); + JetType initializerType = resolveInitializerType(scope, variable.getInitializer(), dataFlowInfo, trace); setConstantForVariableIfNeeded(variableDescriptor, scope, variable, dataFlowInfo, initializerType, trace); return transformAnonymousTypeIfNeeded(variableDescriptor, variable, initializerType, trace); } @@ -1025,7 +1024,7 @@ public class DescriptorResolver { ); } else { - JetType initializerType = resolveInitializerType(scope, initializer, dataFlowInfo, trace); + JetType initializerType = resolveInitializerType(scope, variable.getInitializer(), dataFlowInfo, trace); setConstantForVariableIfNeeded(variableDescriptor, scope, variable, dataFlowInfo, initializerType, trace); return initializerType; }