From 171144e641c5dafd583ecd1148115fa93454066d Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Mon, 29 Apr 2013 15:48:09 +0400
Subject: [PATCH] Change ControlFlow for delegated property

---
 .../jet/lang/cfg/JetControlFlowProcessor.java |  4 +++
 .../cfg/DelegatedProperty.instructions        | 30 +++++++++++++++++++
 compiler/testData/cfg/DelegatedProperty.jet   |  3 ++
 3 files changed, 37 insertions(+)
 create mode 100644 compiler/testData/cfg/DelegatedProperty.instructions
 create mode 100644 compiler/testData/cfg/DelegatedProperty.jet

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
index 91e6937ba5b..80177d269f4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
@@ -718,6 +718,10 @@ public class JetControlFlowProcessor {
                 generateInstructions(initializer, false);
                 builder.write(property, property);
             }
+            JetExpression delegate = property.getDelegateExpression();
+            if (delegate != null) {
+                generateInstructions(delegate, false);
+            }
             for (JetPropertyAccessor accessor : property.getAccessors()) {
                 generateInstructions(accessor, false);
             }
diff --git a/compiler/testData/cfg/DelegatedProperty.instructions b/compiler/testData/cfg/DelegatedProperty.instructions
new file mode 100644
index 00000000000..a57d42d8854
--- /dev/null
+++ b/compiler/testData/cfg/DelegatedProperty.instructions
@@ -0,0 +1,30 @@
+== a ==
+val a = Delegate()
+---------------------
+L0:
+    <START>                  NEXT:[v(val a = Delegate())]    PREV:[]
+    v(val a = Delegate())    NEXT:[r(Delegate)]              PREV:[<START>]
+    r(Delegate)              NEXT:[r(Delegate())]            PREV:[v(val a = Delegate())]
+    r(Delegate())            NEXT:[w(a)]                     PREV:[r(Delegate)]
+    w(a)                     NEXT:[<END>]                    PREV:[r(Delegate())]
+L1:
+    <END>                    NEXT:[<SINK>]                   PREV:[w(a)]
+error:
+    <ERROR>                  NEXT:[<SINK>]                   PREV:[]
+sink:
+    <SINK>                   NEXT:[]                         PREV:[<ERROR>, <END>]
+=====================
+== b ==
+val b by a
+---------------------
+L0:
+    <START>          NEXT:[v(val b by a)]    PREV:[]
+    v(val b by a)    NEXT:[r(a)]             PREV:[<START>]
+    r(a)             NEXT:[<END>]            PREV:[v(val b by a)]
+L1:
+    <END>            NEXT:[<SINK>]           PREV:[r(a)]
+error:
+    <ERROR>          NEXT:[<SINK>]           PREV:[]
+sink:
+    <SINK>           NEXT:[]                 PREV:[<ERROR>, <END>]
+=====================
diff --git a/compiler/testData/cfg/DelegatedProperty.jet b/compiler/testData/cfg/DelegatedProperty.jet
new file mode 100644
index 00000000000..478b174c6e4
--- /dev/null
+++ b/compiler/testData/cfg/DelegatedProperty.jet
@@ -0,0 +1,3 @@
+val a = Delegate()
+
+val b by a
\ No newline at end of file