azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

psi2ir: Merge constant entries in string template expressions

Browse Source 
This is required to handle UCNs properly, see KT-28006.

 #KT-28006
This commit is contained in:
Dmitry Petrov
2018-11-06 18:00:35 +03:00
parent 6bb5e028a5
commit bd1491ac8a
84 changed files with 476 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/expressions/stringPlus.txt
Vendored
+2 -2
View File
@@ -15,7 +15,7 @@ FILE fqName:<root> fileName:/stringPlus.kt
CALL 'plus(Any?): String' type=kotlin.String origin=PLUS
$this: CALL 'plus(Any?): String' type=kotlin.String origin=PLUS
$this: GET_VAR 'value-parameter a: String' type=kotlin.String origin=null
other: CONST String type=kotlin.String value=+
other: CONST String type=kotlin.String value="+"
other: GET_VAR 'value-parameter b: Int' type=kotlin.Int origin=null
FUN name:test3 visibility:public modality:FINAL <> (a:kotlin.String, b:kotlin.Int) returnType:kotlin.String flags:
VALUE_PARAMETER name:a index:0 type:kotlin.String flags:
@@ -26,7 +26,7 @@ FILE fqName:<root> fileName:/stringPlus.kt
$this: CALL 'plus(Any?): String' type=kotlin.String origin=PLUS
$this: CALL 'plus(Any?): String' type=kotlin.String origin=PLUS
$this: GET_VAR 'value-parameter a: String' type=kotlin.String origin=null
other: CONST String type=kotlin.String value=+
other: CONST String type=kotlin.String value="+"
other: CALL 'plus(Int): Int' type=kotlin.Int origin=PLUS
$this: GET_VAR 'value-parameter b: Int' type=kotlin.Int origin=null
other: CONST Int type=kotlin.Int value=1