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

[FIR2IR] Properly set statement origin for all parts of += calls

Browse Source 
^KT-65649 Fixed
This commit is contained in:
Dmitriy Novozhilov
2024-02-27 11:04:41 +02:00
committed by Space Team
parent e4537cb9f0
commit dd94de3a34
43 changed files with 129 additions and 1294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/declarations/delegate/delegationEvaluationOrder1.fir.ir.txt
Vendored
+4 -4
View File
@@ -66,7 +66,7 @@ FILE fqName:foo fileName:/delegationEvaluationOrder1.kt
ANONYMOUS_INITIALIZER isStatic=false
BLOCK_BODY
CALL 'public final fun <set-global> (<set-?>: kotlin.String): kotlin.Unit declared in foo' type=kotlin.Unit origin=EQ
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUSEQ
$this: CALL 'public final fun <get-global> (): kotlin.String declared in foo' type=kotlin.String origin=GET_PROPERTY
other: CONST String type=kotlin.String value=":Derived"
CONSTRUCTOR visibility:public <> () returnType:foo.Derived [primary]
@@ -108,7 +108,7 @@ FILE fqName:foo fileName:/delegationEvaluationOrder1.kt
ANONYMOUS_INITIALIZER isStatic=false
BLOCK_BODY
CALL 'public final fun <set-global> (<set-?>: kotlin.String): kotlin.Unit declared in foo' type=kotlin.Unit origin=EQ
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUSEQ
$this: CALL 'public final fun <get-global> (): kotlin.String declared in foo' type=kotlin.String origin=GET_PROPERTY
other: CONST String type=kotlin.String value=":Derived"
CONSTRUCTOR visibility:public <> () returnType:foo.Derived1 [primary]
@@ -147,7 +147,7 @@ FILE fqName:foo fileName:/delegationEvaluationOrder1.kt
ANONYMOUS_INITIALIZER isStatic=false
BLOCK_BODY
CALL 'public final fun <set-global> (<set-?>: kotlin.String): kotlin.Unit declared in foo' type=kotlin.Unit origin=EQ
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUSEQ
$this: CALL 'public final fun <get-global> (): kotlin.String declared in foo' type=kotlin.String origin=GET_PROPERTY
other: CONST String type=kotlin.String value=":DerivedBase"
CONSTRUCTOR visibility:public <> () returnType:foo.DerivedBase [primary]
@@ -196,7 +196,7 @@ FILE fqName:foo fileName:/delegationEvaluationOrder1.kt
FUN name:newBase visibility:public modality:FINAL <> () returnType:foo.Base
BLOCK_BODY
CALL 'public final fun <set-global> (<set-?>: kotlin.String): kotlin.Unit declared in foo' type=kotlin.Unit origin=EQ
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUSEQ
$this: CALL 'public final fun <get-global> (): kotlin.String declared in foo' type=kotlin.String origin=GET_PROPERTY
other: CONST String type=kotlin.String value=":newBase"
RETURN type=kotlin.Nothing from='public final fun newBase (): foo.Base declared in foo'
compiler/testData/ir/irText/declarations/delegate/delegationEvaluationOrder2.fir.ir.txt
Vendored
+6 -6
View File
@@ -113,7 +113,7 @@ FILE fqName:foo fileName:/delegationEvaluationOrder2.kt
ANONYMOUS_INITIALIZER isStatic=false
BLOCK_BODY
CALL 'public final fun <set-global> (<set-?>: kotlin.String): kotlin.Unit declared in foo' type=kotlin.Unit origin=EQ
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUSEQ
$this: CALL 'public final fun <get-global> (): kotlin.String declared in foo' type=kotlin.String origin=GET_PROPERTY
other: CONST String type=kotlin.String value=":Derived"
CONSTRUCTOR visibility:public <> () returnType:foo.Derived [primary]
@@ -172,7 +172,7 @@ FILE fqName:foo fileName:/delegationEvaluationOrder2.kt
ANONYMOUS_INITIALIZER isStatic=false
BLOCK_BODY
CALL 'public final fun <set-global> (<set-?>: kotlin.String): kotlin.Unit declared in foo' type=kotlin.Unit origin=EQ
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUSEQ
$this: CALL 'public final fun <get-global> (): kotlin.String declared in foo' type=kotlin.String origin=GET_PROPERTY
other: CONST String type=kotlin.String value=":Derived"
CONSTRUCTOR visibility:public <> () returnType:foo.Derived1 [primary]
@@ -231,7 +231,7 @@ FILE fqName:foo fileName:/delegationEvaluationOrder2.kt
ANONYMOUS_INITIALIZER isStatic=false
BLOCK_BODY
CALL 'public final fun <set-global> (<set-?>: kotlin.String): kotlin.Unit declared in foo' type=kotlin.Unit origin=EQ
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUSEQ
$this: CALL 'public final fun <get-global> (): kotlin.String declared in foo' type=kotlin.String origin=GET_PROPERTY
other: CONST String type=kotlin.String value=":Derived"
CONSTRUCTOR visibility:public <> () returnType:foo.Derived2 [primary]
@@ -284,7 +284,7 @@ FILE fqName:foo fileName:/delegationEvaluationOrder2.kt
ANONYMOUS_INITIALIZER isStatic=false
BLOCK_BODY
CALL 'public final fun <set-global> (<set-?>: kotlin.String): kotlin.Unit declared in foo' type=kotlin.Unit origin=EQ
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUSEQ
$this: CALL 'public final fun <get-global> (): kotlin.String declared in foo' type=kotlin.String origin=GET_PROPERTY
other: CONST String type=kotlin.String value=":DerivedBase"
CONSTRUCTOR visibility:public <> () returnType:foo.DerivedBase [primary]
@@ -353,7 +353,7 @@ FILE fqName:foo fileName:/delegationEvaluationOrder2.kt
FUN name:newBase visibility:public modality:FINAL <> () returnType:foo.Base
BLOCK_BODY
CALL 'public final fun <set-global> (<set-?>: kotlin.String): kotlin.Unit declared in foo' type=kotlin.Unit origin=EQ
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUSEQ
$this: CALL 'public final fun <get-global> (): kotlin.String declared in foo' type=kotlin.String origin=GET_PROPERTY
other: CONST String type=kotlin.String value=":newBase"
RETURN type=kotlin.Nothing from='public final fun newBase (): foo.Base declared in foo'
@@ -362,7 +362,7 @@ FILE fqName:foo fileName:/delegationEvaluationOrder2.kt
FUN name:newBase2 visibility:public modality:FINAL <> () returnType:foo.Base2
BLOCK_BODY
CALL 'public final fun <set-global> (<set-?>: kotlin.String): kotlin.Unit declared in foo' type=kotlin.Unit origin=EQ
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null
<set-?>: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUSEQ
$this: CALL 'public final fun <get-global> (): kotlin.String declared in foo' type=kotlin.String origin=GET_PROPERTY
other: CONST String type=kotlin.String value=":newBase2"
RETURN type=kotlin.Nothing from='public final fun newBase2 (): foo.Base2 declared in foo'