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

Do not invoke getDelegateExpression before it is needed

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-04-09 19:29:42 +04:00
parent 5078be1564
commit f15d363087
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+2 -3
View File
@@ -989,8 +989,7 @@ public class DescriptorResolver {
if (!variable.hasInitializer()) { if (!variable.hasInitializer()) {
if (hasDelegate && variableDescriptor instanceof PropertyDescriptor) { if (hasDelegate && variableDescriptor instanceof PropertyDescriptor) {
final JetProperty property = (JetProperty) variable; final JetProperty property = (JetProperty) variable;
final JetExpression propertyDelegateExpression = property.getDelegateExpression(); if (property.hasDelegateExpression()) {
if (propertyDelegateExpression != null) {
return DeferredType.createRecursionIntolerant( return DeferredType.createRecursionIntolerant(
storageManager, storageManager,
trace, trace,
@@ -998,7 +997,7 @@ public class DescriptorResolver {
@Override @Override
public JetType invoke() { public JetType invoke() {
return resolveDelegatedPropertyType(property, (PropertyDescriptor) variableDescriptor, scope, return resolveDelegatedPropertyType(property, (PropertyDescriptor) variableDescriptor, scope,
propertyDelegateExpression, dataFlowInfo, trace); property.getDelegateExpression(), dataFlowInfo, trace);
} }
}); });
} }