From dd24fd47f732a4ac5028a2148501ce657af2b6f5 Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Thu, 10 Dec 2015 18:13:35 +0300
Subject: [PATCH] Update control flow test data for tower resolution algorithm

- locals win
- drop old invokeExtension convention
---
 .../conventions/bothReceivers.instructions    | 30 +++++++++----------
 .../testData/cfg/conventions/bothReceivers.kt |  4 +--
 .../cfg/conventions/bothReceivers.values      | 15 +++++-----
 .../cfg/conventions/getViaVar.instructions    |  6 ++--
 .../testData/cfg/conventions/getViaVar.values |  4 +--
 .../cfg/conventions/setViaVar.instructions    |  4 +--
 .../testData/cfg/conventions/setViaVar.values | 16 +++++-----
 7 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/compiler/testData/cfg/conventions/bothReceivers.instructions b/compiler/testData/cfg/conventions/bothReceivers.instructions
index d42a92a9758..e9fb80b7676 100644
--- a/compiler/testData/cfg/conventions/bothReceivers.instructions
+++ b/compiler/testData/cfg/conventions/bothReceivers.instructions
@@ -40,26 +40,24 @@ sink:
     <SINK>         PREV:[<ERROR>, <END>]
 =====================
 == foobar ==
-fun foobar(f: Foo) {
-    Bar().f()
+fun Foo.foobar(bar: Bar) {
+    bar()
 }
 ---------------------
 L0:
   1 <START>
-    v(f: Foo)
-    magic[FAKE_INITIALIZER](f: Foo) -> <v0>
-    w(f|<v0>)
-  2 mark({ Bar().f() })
-    mark(Bar().f())
-    r(f) -> <v1>
-    mark(Bar())
-    call(Bar(), <init>) -> <v2>
-    mark(f())
-    call(f(), invoke|<v1>, <v2>) -> <v3>
+    v(bar: Bar)
+    magic[FAKE_INITIALIZER](bar: Bar) -> <v0>
+    w(bar|<v0>)
+  2 mark({ bar() })
+    r(bar) -> <v1>
+    magic[IMPLICIT_RECEIVER](bar()) -> <v2>
+    mark(bar())
+    call(bar(), invoke|<v1>, <v2>) -> <v3>
 L1:
-  1 <END>                                      NEXT:[<SINK>]
+  1 <END>                                        NEXT:[<SINK>]
 error:
-    <ERROR>                                    PREV:[]
+    <ERROR>                                      PREV:[]
 sink:
-    <SINK>                                     PREV:[<ERROR>, <END>]
-=====================
\ No newline at end of file
+    <SINK>                                       PREV:[<ERROR>, <END>]
+=====================
diff --git a/compiler/testData/cfg/conventions/bothReceivers.kt b/compiler/testData/cfg/conventions/bothReceivers.kt
index 1ad462cb71d..2104e57bc23 100644
--- a/compiler/testData/cfg/conventions/bothReceivers.kt
+++ b/compiler/testData/cfg/conventions/bothReceivers.kt
@@ -5,6 +5,6 @@ class Foo() {
     fun Bar.invoke() {}
 }
 
-fun foobar(f: Foo) {
-    Bar().f()
+fun Foo.foobar(bar: Bar) {
+    bar()
 }
\ No newline at end of file
diff --git a/compiler/testData/cfg/conventions/bothReceivers.values b/compiler/testData/cfg/conventions/bothReceivers.values
index d9c0e62cc0f..112449e0e93 100644
--- a/compiler/testData/cfg/conventions/bothReceivers.values
+++ b/compiler/testData/cfg/conventions/bothReceivers.values
@@ -14,14 +14,13 @@ fun Bar.invoke() {}
 ---------------------
 =====================
 == foobar ==
-fun foobar(f: Foo) {
-    Bar().f()
+fun Foo.foobar(bar: Bar) {
+    bar()
 }
 ---------------------
-                <v0>: Foo   NEW: magic[FAKE_INITIALIZER](f: Foo) -> <v0>
-Bar()           <v2>: Bar   NEW: call(Bar(), <init>) -> <v2>            
-f               <v1>: Foo   NEW: r(f) -> <v1>                           
-f()             <v3>: *     NEW: call(f(), invoke|<v1>, <v2>) -> <v3>   
-Bar().f()       <v3>: *     COPY                                        
-{ Bar().f() }   <v3>: *     COPY                                        
+            <v0>: Bar   NEW: magic[FAKE_INITIALIZER](bar: Bar) -> <v0>
+            <v2>: Foo   NEW: magic[IMPLICIT_RECEIVER](bar()) -> <v2>
+bar         <v1>: Bar   NEW: r(bar) -> <v1>
+bar()       <v3>: *     NEW: call(bar(), invoke|<v1>, <v2>) -> <v3>
+{ bar() }   <v3>: *     COPY
 =====================
diff --git a/compiler/testData/cfg/conventions/getViaVar.instructions b/compiler/testData/cfg/conventions/getViaVar.instructions
index 8eb26af0462..ff3816c549c 100644
--- a/compiler/testData/cfg/conventions/getViaVar.instructions
+++ b/compiler/testData/cfg/conventions/getViaVar.instructions
@@ -86,11 +86,11 @@ L0:
     w(get|<v1>)
   2 mark({ foo[1] })
     mark(foo[1])
-    r(foo) -> <v2>
-    r(foo[1], get|<v2>) -> <v3>
+    r(foo[1], get) -> <v2>
+    r(foo) -> <v3>
     r(1) -> <v4>
     mark(foo[1])
-    call(foo[1], invoke|<v3>, <v4>) -> <v5>
+    call(foo[1], invoke|<v2>, <v3>, <v4>) -> <v5>
 L1:
   1 <END>                                                     NEXT:[<SINK>]
 error:
diff --git a/compiler/testData/cfg/conventions/getViaVar.values b/compiler/testData/cfg/conventions/getViaVar.values
index 07c89479ef0..30441f54865 100644
--- a/compiler/testData/cfg/conventions/getViaVar.values
+++ b/compiler/testData/cfg/conventions/getViaVar.values
@@ -35,8 +35,8 @@ fun test2(foo: Foo, get: Foo.(Int) -> Int) {
 ---------------------
              <v0>: Foo                     NEW: magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
              <v1>: {<: Foo.(Int) -> Int}   NEW: magic[FAKE_INITIALIZER](get: Foo.(Int) -> Int) -> <v1>
-foo          <v2>: Foo                     NEW: r(foo) -> <v2>
+foo          <v3>: Foo                     NEW: r(foo) -> <v3>
 1            <v4>: Int                     NEW: r(1) -> <v4>
-foo[1]       <v5>: *                       NEW: call(foo[1], invoke|<v3>, <v4>) -> <v5>
+foo[1]       <v5>: *                       NEW: call(foo[1], invoke|<v2>, <v3>, <v4>) -> <v5>
 { foo[1] }   <v5>: *                       COPY
 =====================
diff --git a/compiler/testData/cfg/conventions/setViaVar.instructions b/compiler/testData/cfg/conventions/setViaVar.instructions
index 1552ebd8011..9ac1475e0d2 100644
--- a/compiler/testData/cfg/conventions/setViaVar.instructions
+++ b/compiler/testData/cfg/conventions/setViaVar.instructions
@@ -90,10 +90,10 @@ L0:
   2 mark({ foo[1] = 2 })
     mark(foo[1])
     r(foo) -> <v2>
-    r(foo[1], set|<v2>) -> <v3>
+    r(foo[1], set) -> <v3>
     r(1) -> <v4>
     r(2) -> <v5>
-    call(foo[1] = 2, invoke|<v3>, <v4>, <v5>) -> <v6>
+    call(foo[1] = 2, invoke|<v3>, <v2>, <v4>, <v5>) -> <v6>
 L1:
   1 <END>                                                          NEXT:[<SINK>]
 error:
diff --git a/compiler/testData/cfg/conventions/setViaVar.values b/compiler/testData/cfg/conventions/setViaVar.values
index 14d484ac143..90dcbd2e3d3 100644
--- a/compiler/testData/cfg/conventions/setViaVar.values
+++ b/compiler/testData/cfg/conventions/setViaVar.values
@@ -35,12 +35,12 @@ fun test2(foo: Foo, set: Foo.(Int, Int) -> Int) {
     foo[1] = 2
 }
 ---------------------
-                 <v0>: Foo                          NEW: magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
-                 <v1>: {<: Foo.(Int, Int) -> Int}   NEW: magic[FAKE_INITIALIZER](set: Foo.(Int, Int) -> Int) -> <v1>
-foo              <v2>: Foo                          NEW: r(foo) -> <v2>
-1                <v4>: Int                          NEW: r(1) -> <v4>
-foo[1]           <v3>: Bar                          NEW: r(foo[1], set|<v2>) -> <v3>
-2                <v5>: Int                          NEW: r(2) -> <v5>
-foo[1] = 2       <v6>: *                            NEW: call(foo[1] = 2, invoke|<v3>, <v4>, <v5>) -> <v6>
-{ foo[1] = 2 }   <v6>: *                            COPY
+                 <v0>: Foo                           NEW: magic[FAKE_INITIALIZER](foo: Foo) -> <v0>
+                 <v1>: {<: Foo.(Int, Int) -> Int}    NEW: magic[FAKE_INITIALIZER](set: Foo.(Int, Int) -> Int) -> <v1>
+foo              <v2>: Foo                           NEW: r(foo) -> <v2>
+1                <v4>: Int                           NEW: r(1) -> <v4>
+foo[1]           <v3>: {<: (Foo, Int, Int) -> Int}   NEW: r(foo[1], set) -> <v3>
+2                <v5>: Int                           NEW: r(2) -> <v5>
+foo[1] = 2       <v6>: *                             NEW: call(foo[1] = 2, invoke|<v3>, <v2>, <v4>, <v5>) -> <v6>
+{ foo[1] = 2 }   <v6>: *                             COPY
 =====================