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/objectReferenceInFieldInitializer.txt
Vendored
+2 -2
View File
@@ -8,7 +8,7 @@ FILE fqName:<root> fileName:/objectReferenceInFieldInitializer.kt
PROPERTY name:a visibility:private modality:FINAL flags:val
FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.String visibility:private flags:final
EXPRESSION_BODY
CONST String type=kotlin.String value=$
CONST String type=kotlin.String value="$"
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-a> visibility:private modality:FINAL <> ($this:A) returnType:kotlin.String flags:
correspondingProperty: PROPERTY name:a visibility:private modality:FINAL flags:val
$this: VALUE_PARAMETER name:<this> type:A flags:
@@ -20,7 +20,7 @@ FILE fqName:<root> fileName:/objectReferenceInFieldInitializer.kt
FIELD PROPERTY_BACKING_FIELD name:b type:kotlin.String visibility:private flags:final
EXPRESSION_BODY
STRING_CONCATENATION type=kotlin.String
CONST String type=kotlin.String value=1234
CONST String type=kotlin.String value="1234"
CALL '<get-a>(): String' type=kotlin.String origin=GET_PROPERTY
$this: GET_VAR 'this@A: A' type=A origin=null
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-b> visibility:private modality:FINAL <> ($this:A) returnType:kotlin.String flags: