Control-Flow Analysis: Use PSI to generate pseudocode if nested resolved call is confused with outer one (e.g. a {} when invoke() is missing)

#KT-14500 Fixed
2016-11-02 16:15:07 +03:00
parent e8b5387384
commit a414843f54
9 changed files with 103 additions and 8 deletions
@@ -0,0 +1,52 @@
+== A ==
+class A
+---------------------
+L0:
+  1 <START>
+L1:
+    <END>      NEXT:[<SINK>]
+error:
+    <ERROR>    PREV:[]
+sink:
+    <SINK>     PREV:[<ERROR>, <END>]
+=====================
+== test ==
+fun test(a: A) {
+    a { }
+}
+---------------------
+L0:
+  1 <START>
+    v(a: A)
+    magic[FAKE_INITIALIZER](a: A) -> <v0>
+    w(a|<v0>)
+  2 mark({ a { } })
+    mark({ })
+    jmp?(L2)                                            NEXT:[r({ }) -> <v1>, d({ })]
+    d({ })                                              NEXT:[<SINK>]
+L2 [after local declaration]:
+    r({ }) -> <v1>                                      PREV:[jmp?(L2)]
+    r(a) -> <v2>
+    mark(a { })
+    magic[UNRESOLVED_CALL](a { }|<v1>, <v2>) -> <v3>
+L1:
+  1 <END>                                               NEXT:[<SINK>]
+error:
+    <ERROR>                                             PREV:[]
+sink:
+    <SINK>                                              PREV:[<ERROR>, <END>, d({ })]
+=====================
+== anonymous_0 ==
+{ }
+---------------------
+L3:
+  3 <START>
+  4 mark()
+    read (Unit)
+L4:
+  3 <END>          NEXT:[<SINK>]
+error:
+    <ERROR>        PREV:[]
+sink:
+    <SINK>         PREV:[<ERROR>, <END>]
+=====================
@@ -0,0 +1,5 @@
+class A
+
+fun test(a: A) {
+    a { }
+}
@@ -0,0 +1,19 @@
+== A ==
+class A
+---------------------
+=====================
+== test ==
+fun test(a: A) {
+    a { }
+}
+---------------------
+            <v0>: A   NEW: magic[FAKE_INITIALIZER](a: A) -> <v0>
+a           <v2>: *   NEW: r(a) -> <v2>
+{ }         <v1>: *   NEW: r({ }) -> <v1>
+a { }       <v3>: *   NEW: magic[UNRESOLVED_CALL](a { }|<v1>, <v2>) -> <v3>
+{ a { } }   <v3>: *   COPY
+=====================
+== anonymous_0 ==
+{ }
+---------------------
+=====================
@@ -10,10 +10,12 @@ L0:
    w(i|<v0>)
  2 mark({ i() })
    r(i) -> <v1>
+    mark(i())
+    magic[UNRESOLVED_CALL](i()|<v1>) -> <v2>
 L1:
-  1 <END>                                      NEXT:[<SINK>]
+  1 <END>                                       NEXT:[<SINK>]
 error:
-    <ERROR>                                    PREV:[]
+    <ERROR>                                     PREV:[]
 sink:
-    <SINK>                                     PREV:[<ERROR>, <END>]
-=====================
+    <SINK>                                      PREV:[<ERROR>, <END>]
+=====================
@@ -5,6 +5,6 @@ fun foo(i: Int) {
 ---------------------
          <v0>: Int   NEW: magic[FAKE_INITIALIZER](i: Int) -> <v0>
 i         <v1>: *     NEW: r(i) -> <v1>
-i()       !<v2>: *
-{ i() }   !<v2>: *    COPY
-=====================
+i()       <v2>: *     NEW: magic[UNRESOLVED_CALL](i()|<v1>) -> <v2>
+{ i() }   <v2>: *     COPY
+=====================