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

[FIR] Fix invalid CallableId for methods in anonymous objects

Browse Source
This commit is contained in:
Igor Yakovlev
2021-06-25 18:28:59 +02:00
committed by teamcityserver
parent 47aa04d55d
commit 30c381f16d
12 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot
Vendored
+4 -4
View File
@@ -352,7 +352,7 @@ digraph localClassesWithImplicit_kt {
123 [label="Enter block"];
124 [label="Access variable R|<local>/b|"];
125 [label="Access variable R|kotlin/String.length|"];
126 [label="Function call: this@R|/<anonymous>|.R|<local>/bar|()"];
126 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.bar|()"];
127 [label="Exit block"];
}
128 [label="Exit when branch result"];
@@ -369,7 +369,7 @@ digraph localClassesWithImplicit_kt {
^ when () {
(R|<local>/b| is R|kotlin/String|) -> {
R|<local>/b|.R|kotlin/String.length|
this@R|/<anonymous>|.R|<local>/bar|()
this@R|/<anonymous>|.R|/<anonymous>.bar|()
}
else -> {
Int(1)
@@ -439,7 +439,7 @@ digraph localClassesWithImplicit_kt {
144 [label="Access variable R|kotlin/String.length|"];
145 [label="Access variable R|<local>/b|"];
146 [label="Access variable <Unresolved name: length>#"];
147 [label="Function call: this@R|/<anonymous>|.R|<local>/baz|()"];
147 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.baz|()"];
148 [label="Exit block"];
}
149 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
@@ -449,7 +449,7 @@ digraph localClassesWithImplicit_kt {
137 [label="Jump: ^bar R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=UNKNOWN> {
R|<local>/a|.R|kotlin/String.length|
R|<local>/b|.<Unresolved name: length>#
^ this@R|/<anonymous>|.R|<local>/baz|()
^ this@R|/<anonymous>|.R|/<anonymous>.baz|()
}
)"];
138 [label="Stub" style="filled" fillcolor=gray];
compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.fir.txt
Vendored
+2 -2
View File
@@ -57,7 +57,7 @@ FILE: localClassesWithImplicit.kt
^ when () {
(R|<local>/b| is R|kotlin/String|) -> {
R|<local>/b|.R|kotlin/String.length|
this@R|/<anonymous>|.R|<local>/bar|()
this@R|/<anonymous>|.R|/<anonymous>.bar|()
}
else -> {
Int(1)
@@ -72,7 +72,7 @@ FILE: localClassesWithImplicit.kt
^bar R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=UNKNOWN> {
R|<local>/a|.R|kotlin/String.length|
R|<local>/b|.<Unresolved name: length>#
^ this@R|/<anonymous>|.R|<local>/baz|()
^ this@R|/<anonymous>|.R|/<anonymous>.baz|()
}
)
}
compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.fir.txt
Vendored
+2 -2
View File
@@ -57,12 +57,12 @@ FILE: CallBasedInExpressionGenerator.kt
}
public final override fun putSelector(type: R|org/jetbrains/kotlin/codegen/range/inExpression/Type|, kotlinType: R|org/jetbrains/kotlin/codegen/range/inExpression/KotlinType?|, v: R|org/jetbrains/kotlin/codegen/range/inExpression/InstructionAdapter|): R|kotlin/Unit| {
this@R|/<anonymous>|.R|<local>/invokeFunction|(R|<local>/v|)
this@R|/<anonymous>|.R|/<anonymous>.invokeFunction|(R|<local>/v|)
<Unresolved name: coerceTo>#(R|<local>/type|, R|<local>/kotlinType|, R|<local>/v|)
}
public final override fun condJump(jumpLabel: R|org/jetbrains/kotlin/codegen/range/inExpression/Label|, v: R|org/jetbrains/kotlin/codegen/range/inExpression/InstructionAdapter|, jumpIfFalse: R|kotlin/Boolean|): R|kotlin/Unit| {
this@R|/<anonymous>|.R|<local>/invokeFunction|(R|<local>/v|)
this@R|/<anonymous>|.R|/<anonymous>.invokeFunction|(R|<local>/v|)
R|<local>/v|.<Unresolved name: visitJumpInsn>#(when () {
R|<local>/jumpIfFalse| -> {
<Unresolved name: Opcodes>#.<Unresolved name: IFEQ>#
compiler/fir/analysis-tests/testData/resolve/expresssions/localImplicitBodies.fir.txt
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@ FILE: localImplicitBodies.kt
}
public final fun sss(): R|kotlin/Int| {
^sss this@R|/<anonymous>|.R|<local>/abc|()
^sss this@R|/<anonymous>|.R|/<anonymous>.abc|()
}
public final fun abc(): R|kotlin/Int| {
@@ -15,5 +15,5 @@ FILE: localImplicitBodies.kt
}
lval g: R|kotlin/Int| = R|<local>/x|.R|<local>/sss|()
lval g: R|kotlin/Int| = R|<local>/x|.R|/<anonymous>.sss|()
}
compiler/fir/analysis-tests/testData/resolve/expresssions/localScopes.fir.txt
Vendored
+1 -1
View File
@@ -32,7 +32,7 @@ FILE: localScopes.kt
}
R|<local>/anonymous|.R|<local>/baz|()
R|<local>/anonymous|.R|/<anonymous>.baz|()
R|<local>/anonymous|.R|/Bar.foo|()
local final class DerivedLocal : R|BaseLocal| {
public constructor(): R|DerivedLocal| {
compiler/fir/analysis-tests/testData/resolve/expresssions/localWithBooleanNot.fir.txt
Vendored
+2 -2
View File
@@ -10,11 +10,11 @@ FILE: foo.kt
private set(value: R|kotlin/Boolean|): R|kotlin/Unit|
public final fun bar(): R|kotlin/Boolean| {
^bar this@R|/<anonymous>|.R|<local>/result|.R|kotlin/Boolean.not|()
^bar this@R|/<anonymous>|.R|/<anonymous>.result|.R|kotlin/Boolean.not|()
}
public final override fun result(): R|kotlin/Boolean| {
^result this@R|/<anonymous>|.R|<local>/result|
^result this@R|/<anonymous>|.R|/<anonymous>.result|
}
}