[FIR IDE] Fix lazy resolve for local declarations

This commit is contained in:
Igor Yakovlev
2021-06-15 19:05:25 +02:00
parent c17a67ba61
commit ec80c21fd1
29 changed files with 133 additions and 133 deletions
@@ -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|/<anonymous>.invokeFunction|(R|<local>/v|)
this@R|/<anonymous>|.R|<local>/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|/<anonymous>.invokeFunction|(R|<local>/v|)
this@R|/<anonymous>|.R|<local>/invokeFunction|(R|<local>/v|)
R|<local>/v|.<Unresolved name: visitJumpInsn>#(when () {
R|<local>/jumpIfFalse| -> {
<Unresolved name: Opcodes>#.<Unresolved name: IFEQ>#
@@ -6,7 +6,7 @@ FILE: localImplicitBodies.kt
}
public final fun sss(): R|kotlin/Int| {
^sss this@R|/<anonymous>|.R|/<anonymous>.abc|()
^sss this@R|/<anonymous>|.R|<local>/abc|()
}
public final fun abc(): R|kotlin/Int| {
@@ -15,5 +15,5 @@ FILE: localImplicitBodies.kt
}
lval g: R|kotlin/Int| = R|<local>/x|.R|/<anonymous>.sss|()
lval g: R|kotlin/Int| = R|<local>/x|.R|<local>/sss|()
}
@@ -38,7 +38,7 @@ FILE: localObjects.kt
}
Q|B|.R|/B.foo|()
Q|B|.R|<local>/foo|()
}
public final val bb: <ERROR TYPE REF: Unresolved name: foo> = <Unresolved name: B>#.<Unresolved name: foo>#()
public get(): <ERROR TYPE REF: Unresolved name: foo>
@@ -20,7 +20,7 @@ FILE: localScopes.kt
}
lval base: R|BaseLocal| = R|/BaseLocal.BaseLocal|()
R|<local>/base|.R|/BaseLocal.baz|()
R|<local>/base|.R|<local>/baz|()
R|<local>/base|.R|/Bar.foo|()
lval anonymous: R|<anonymous>| = object : R|Bar| {
private constructor(): R|<anonymous>| {
@@ -32,7 +32,7 @@ FILE: localScopes.kt
}
R|<local>/anonymous|.R|/<anonymous>.baz|()
R|<local>/anonymous|.R|<local>/baz|()
R|<local>/anonymous|.R|/Bar.foo|()
local final class DerivedLocal : R|BaseLocal| {
public constructor(): R|DerivedLocal| {
@@ -45,7 +45,7 @@ FILE: localScopes.kt
}
lval derived: R|DerivedLocal| = R|/DerivedLocal.DerivedLocal|()
R|<local>/derived|.R|/DerivedLocal.gau|()
R|<local>/derived|.R|/BaseLocal.baz|()
R|<local>/derived|.R|<local>/gau|()
R|<local>/derived|.R|<local>/baz|()
R|<local>/derived|.R|/Bar.foo|()
}
@@ -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|/<anonymous>.result|.R|kotlin/Boolean.not|()
^bar this@R|/<anonymous>|.R|<local>/result|.R|kotlin/Boolean.not|()
}
public final override fun result(): R|kotlin/Boolean| {
^result this@R|/<anonymous>|.R|/<anonymous>.result|
^result this@R|/<anonymous>|.R|<local>/result|
}
}
@@ -71,7 +71,7 @@ FILE: first.kt
private final fun bar(): R|kotlin/Unit|
public final fun baz(): R|kotlin/Unit| {
this@R|/Local|.R|/Local.bar|()
this@R|/Local|.R|<local>/bar|()
this@R|/Local|.R|/Local.Inner.Inner|()
}
@@ -81,15 +81,15 @@ FILE: first.kt
}
public final fun foo(): R|kotlin/Unit| {
this@R|/Local|.R|/Local.bar|()
this@R|/Local|.R|<local>/bar|()
}
}
}
R|/Local.Local|().R|/Local.baz|()
R|/Local.Local|().<HIDDEN: /Local.bar is invisible>#()
R|/Local.Local|().R|<local>/baz|()
R|/Local.Local|().<HIDDEN: <local>/bar is invisible>#()
}
public final fun test(): R|kotlin/Unit| {
R|/foo|()