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/declarations/annotations/arrayInAnnotationArguments.txt
Vendored
+12 -12
View File
@@ -64,9 +64,9 @@ FILE fqName:<root> fileName:/arrayInAnnotationArguments.kt
CONST Int type=kotlin.Int value=3
CALL 'constructor TestAnnWithStringArray(Array<String>)' type=TestAnnWithStringArray origin=null
x: VARARG type=kotlin.Array<kotlin.String> varargElementType=kotlin.String
CONST String type=kotlin.String value=a
CONST String type=kotlin.String value=b
CONST String type=kotlin.String value=c
CONST String type=kotlin.String value="a"
CONST String type=kotlin.String value="b"
CONST String type=kotlin.String value="c"
CALL 'constructor TestAnnWithIntArray(IntArray)' type=TestAnnWithIntArray origin=null
x: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
CONST Int type=kotlin.Int value=1
@@ -74,9 +74,9 @@ FILE fqName:<root> fileName:/arrayInAnnotationArguments.kt
CONST Int type=kotlin.Int value=3
CALL 'constructor TestAnnWithStringArray(Array<String>)' type=TestAnnWithStringArray origin=null
x: VARARG type=kotlin.Array<kotlin.String> varargElementType=kotlin.String
CONST String type=kotlin.String value=a
CONST String type=kotlin.String value=b
CONST String type=kotlin.String value=c
CONST String type=kotlin.String value="a"
CONST String type=kotlin.String value="b"
CONST String type=kotlin.String value="c"
BLOCK_BODY
FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
annotations:
@@ -87,9 +87,9 @@ FILE fqName:<root> fileName:/arrayInAnnotationArguments.kt
CONST Int type=kotlin.Int value=6
CALL 'constructor TestAnnWithStringArray(Array<String>)' type=TestAnnWithStringArray origin=null
x: VARARG type=kotlin.Array<kotlin.String> varargElementType=kotlin.String
CONST String type=kotlin.String value=d
CONST String type=kotlin.String value=e
CONST String type=kotlin.String value=f
CONST String type=kotlin.String value="d"
CONST String type=kotlin.String value="e"
CONST String type=kotlin.String value="f"
CALL 'constructor TestAnnWithIntArray(IntArray)' type=TestAnnWithIntArray origin=null
x: VARARG type=kotlin.IntArray varargElementType=kotlin.Int
CONST Int type=kotlin.Int value=4
@@ -97,8 +97,8 @@ FILE fqName:<root> fileName:/arrayInAnnotationArguments.kt
CONST Int type=kotlin.Int value=6
CALL 'constructor TestAnnWithStringArray(Array<String>)' type=TestAnnWithStringArray origin=null
x: VARARG type=kotlin.Array<kotlin.String> varargElementType=kotlin.String
CONST String type=kotlin.String value=d
CONST String type=kotlin.String value=e
CONST String type=kotlin.String value=f
CONST String type=kotlin.String value="d"
CONST String type=kotlin.String value="e"
CONST String type=kotlin.String value="f"
BLOCK_BODY