Control-Flow: Improve debug text of ReadValueInstruction

2015-05-20 16:01:09 +03:00
parent 868329e3cb
commit 3d3b5591e1
16 changed files with 32 additions and 24 deletions
@@ -13,11 +13,11 @@ L0:
    v(val a: Int get() = 1)
  2 mark({ $a })
    magic[IMPLICIT_RECEIVER]($a) -> <v0>
-    r($a|<v0>) -> <v1>
+    r($a, a|<v0>) -> <v1>
 L1:
  1 <END>                                   NEXT:[<SINK>]
 error:
    <ERROR>                                 PREV:[]
 sink:
    <SINK>                                  PREV:[<ERROR>, <END>]
-=====================
+=====================
@@ -9,6 +9,6 @@ class C {
 }
 ---------------------
         <v0>: C   NEW: magic[IMPLICIT_RECEIVER]($a) -> <v0>
-$a       <v1>: *   NEW: r($a|<v0>) -> <v1>
+$a       <v1>: *   NEW: r($a, a|<v0>) -> <v1>
 { $a }   <v1>: *   COPY
 =====================
@@ -22,8 +22,8 @@ L0:
    mark("foo")
    r("foo") -> <v0>
    mark(this.$bar)
-    r(this) -> <v1>
-    r($bar|<v1>) -> <v2>
+    r(this, <this>) -> <v1>
+    r($bar, bar|<v1>) -> <v2>
    mark("foo" + this.$bar)
    call("foo" + this.$bar, plus|<v0>, <v2>) -> <v3>
    ret(*|<v3>) L1
@@ -33,4 +33,4 @@ error:
    <ERROR>                                             PREV:[]
 sink:
    <SINK>                                              PREV:[<ERROR>, <END>]
-=====================
+=====================
@@ -10,8 +10,8 @@ fun foo() = "foo" + this.$bar
 ---------------------
 "foo"               <v0>: String     NEW: r("foo") -> <v0>
 this                <v1>: {<: Bar}   COPY
-this                <v1>: {<: Bar}   NEW: r(this) -> <v1>
-$bar                <v2>: *          NEW: r($bar|<v1>) -> <v2>
+this                <v1>: {<: Bar}   NEW: r(this, <this>) -> <v1>
+$bar                <v2>: *          NEW: r($bar, bar|<v1>) -> <v2>
 this.$bar           <v2>: *          COPY
 "foo" + this.$bar   <v3>: String     NEW: call("foo" + this.$bar, plus|<v0>, <v2>) -> <v3>
 =====================