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/parameters/constructor.txt
Vendored
+1 -1
View File
@@ -124,7 +124,7 @@ FILE fqName:<root> fileName:/constructor.kt
VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
VALUE_PARAMETER name:y index:1 type:kotlin.String flags:
EXPRESSION_BODY
CONST String type=kotlin.String value=
CONST String type=kotlin.String value=""
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
INSTANCE_INITIALIZER_CALL classDescriptor='Test3'
compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt
Vendored
+6 -6
View File
@@ -6,7 +6,7 @@ FILE fqName:<root> fileName:/dataClassMembers.kt
VALUE_PARAMETER name:x index:0 type:T flags:
VALUE_PARAMETER name:y index:1 type:kotlin.String flags:
EXPRESSION_BODY
CONST String type=kotlin.String value=
CONST String type=kotlin.String value=""
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
INSTANCE_INITIALIZER_CALL classDescriptor='Test'
@@ -67,15 +67,15 @@ FILE fqName:<root> fileName:/dataClassMembers.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='toString(): String'
STRING_CONCATENATION type=kotlin.String
CONST String type=kotlin.String value=Test(
CONST String type=kotlin.String value=x=
CONST String type=kotlin.String value="Test("
CONST String type=kotlin.String value="x="
CALL '<get-x>(): T' type=T origin=GET_PROPERTY
$this: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
CONST String type=kotlin.String value=,
CONST String type=kotlin.String value=y=
CONST String type=kotlin.String value=", "
CONST String type=kotlin.String value="y="
CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
$this: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
CONST String type=kotlin.String value=)
CONST String type=kotlin.String value=")"
FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:Test<T>) returnType:kotlin.Int flags:
overridden:
FUN IR_EXTERNAL_DECLARATION_STUB name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:
compiler/testData/ir/irText/declarations/parameters/fun.txt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ FILE fqName:<root> fileName:/fun.kt
CONST Int type=kotlin.Int value=0
VALUE_PARAMETER name:j index:1 type:kotlin.String flags:
EXPRESSION_BODY
CONST String type=kotlin.String value=
CONST String type=kotlin.String value=""
BLOCK_BODY
FUN name:test3 visibility:public modality:FINAL <> (args:kotlin.Array<out kotlin.String>) returnType:kotlin.Unit flags:
VALUE_PARAMETER name:args index:0 type:kotlin.Array<out kotlin.String> varargElementType:kotlin.String flags:vararg
compiler/testData/ir/irText/declarations/parameters/localFun.txt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ FILE fqName:<root> fileName:/localFun.kt
CONST Int type=kotlin.Int value=0
VALUE_PARAMETER name:j index:1 type:kotlin.String flags:
EXPRESSION_BODY
CONST String type=kotlin.String value=
CONST String type=kotlin.String value=""
BLOCK_BODY
FUN name:test3 visibility:local modality:FINAL <> (args:kotlin.Array<out kotlin.String>) returnType:kotlin.Unit flags:
VALUE_PARAMETER name:args index:0 type:kotlin.Array<out kotlin.String> varargElementType:kotlin.String flags:vararg