From f15d363087945aa1fd07f85bdb0cc613cda1c77b Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 9 Apr 2014 19:29:42 +0400
Subject: [PATCH] Do not invoke getDelegateExpression before it is needed

---
 .../org/jetbrains/jet/lang/resolve/DescriptorResolver.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 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 b0984d0a35b..85a73166855 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
@@ -989,8 +989,7 @@ public class DescriptorResolver {
             if (!variable.hasInitializer()) {
                 if (hasDelegate && variableDescriptor instanceof PropertyDescriptor) {
                     final JetProperty property = (JetProperty) variable;
-                    final JetExpression propertyDelegateExpression = property.getDelegateExpression();
-                    if (propertyDelegateExpression != null) {
+                    if (property.hasDelegateExpression()) {
                         return DeferredType.createRecursionIntolerant(
                                 storageManager,
                                 trace,
@@ -998,7 +997,7 @@ public class DescriptorResolver {
                                     @Override
                                     public JetType invoke() {
                                         return resolveDelegatedPropertyType(property, (PropertyDescriptor) variableDescriptor, scope,
-                                                                            propertyDelegateExpression, dataFlowInfo, trace);
+                                                                            property.getDelegateExpression(), dataFlowInfo, trace);
                                     }
                                 });
                     }