2885df14ee
Now we will try to avoid redundant calculation:
* Class-like declarations can be calculated without super types
* Overridden search logic not is out of lock
Unfortunately, right now it is not safe to use
StatusResolveMode.FunctionWithSpecificName and
StatusResolveMode.PropertyWithSpecificName
because lazyResolveToPhaseWithCallableMembers can lead to an incorrect
state of scope. Example:
```
open class A {
open fun a() {}
open fun b() {}
}
class C : A()
```
Steps:
1. Resolve constructor of C to STATUS
2. Now we want to call lazyResolveToPhaseWithCallableMembers on
C, and this call will do nothing because this class and all
its declarations (only constructor) are already in STATUS phase,
so class A won't be resolved as expected
^KT-56551
350 lines
14 KiB
Plaintext
350 lines
14 KiB
Plaintext
RAW_FIR:
|
|
FILE: [ResolvedTo(RAW_FIR)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
|
|
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
|
|
|
|
public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
LAZY_super<<implicit>>
|
|
}
|
|
|
|
public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
IMPORTS:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
|
|
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
|
|
|
|
public? final? [ResolvedTo(RAW_FIR)] class ResolveMe : OV {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
LAZY_super<<implicit>>
|
|
}
|
|
|
|
public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
COMPILER_REQUIRED_ANNOTATIONS:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
|
|
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
|
|
|
|
public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class ResolveMe : OV {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
LAZY_super<<implicit>>
|
|
}
|
|
|
|
public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
COMPANION_GENERATION:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| {
|
|
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
|
|
|
|
public? final? [ResolvedTo(COMPANION_GENERATION)] class ResolveMe : OV {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
LAZY_super<<implicit>>
|
|
}
|
|
|
|
public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
SUPER_TYPES:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public? final? [ResolvedTo(SUPER_TYPES)] interface OV : R|kotlin/Any| {
|
|
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
|
|
|
|
public? final? [ResolvedTo(SUPER_TYPES)] class ResolveMe : R|OV| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
LAZY_super<<implicit>>
|
|
}
|
|
|
|
public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
TYPES:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public? final? [ResolvedTo(TYPES)] interface OV : R|kotlin/Any| {
|
|
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
|
|
|
|
public? final? [ResolvedTo(TYPES)] class ResolveMe : R|OV| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
LAZY_super<<implicit>>
|
|
}
|
|
|
|
public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
STATUS:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
|
|
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
|
|
|
|
public final [ResolvedTo(STATUS)] class ResolveMe : R|OV| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
LAZY_super<<implicit>>
|
|
}
|
|
|
|
public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
EXPECT_ACTUAL_MATCHING:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
|
|
public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A
|
|
|
|
public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class ResolveMe : R|OV| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
LAZY_super<<implicit>>
|
|
}
|
|
|
|
public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
ARGUMENTS_OF_ANNOTATIONS:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
|
|
public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
|
|
public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
|
|
|
|
public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class ResolveMe : R|OV| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
LAZY_super<<implicit>>
|
|
}
|
|
|
|
public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
CONTRACTS:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
|
|
public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
|
|
public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
|
|
|
|
public final [ResolvedTo(CONTRACTS)] class ResolveMe : R|OV| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
LAZY_super<<implicit>>
|
|
}
|
|
|
|
public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
IMPLICIT_TYPES_BODY_RESOLVE:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
|
|
public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
|
|
public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
|
|
|
|
public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class ResolveMe : R|OV| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
LAZY_super<<implicit>>
|
|
}
|
|
|
|
public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
ANNOTATIONS_ARGUMENTS_MAPPING:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
|
|
public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
|
|
public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
|
|
|
|
public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class ResolveMe : R|OV| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
LAZY_super<<implicit>>
|
|
}
|
|
|
|
public? open? override [ResolvedTo(RAW_FIR)] val originalExpressions: A
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] get(): A
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
BODY_RESOLVE:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| {
|
|
public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A|
|
|
public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A|
|
|
|
|
public final [ResolvedTo(BODY_RESOLVE)] class ResolveMe : R|OV| {
|
|
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
super<R|kotlin/Any|>()
|
|
}
|
|
|
|
public open override [ResolvedTo(BODY_RESOLVE)] val originalExpressions: R|A|
|
|
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ResolveMe] get(): R|A|
|
|
|
|
}
|
|
|
|
}
|
|
public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
|
|
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
|
|
LAZY_super<R|kotlin/Any|>
|
|
}
|
|
|
|
}
|
|
|
|
FILE RAW TO BODY:
|
|
FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt
|
|
[ResolvedTo(BODY_RESOLVE)] annotations container
|
|
public abstract [ResolvedTo(BODY_RESOLVE)] interface OV : R|kotlin/Any| {
|
|
public abstract [ResolvedTo(BODY_RESOLVE)] val originalExpressions: R|A|
|
|
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=OV] get(): R|A|
|
|
|
|
public final [ResolvedTo(BODY_RESOLVE)] class ResolveMe : R|OV| {
|
|
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| {
|
|
super<R|kotlin/Any|>()
|
|
}
|
|
|
|
public open override [ResolvedTo(BODY_RESOLVE)] val originalExpressions: R|A|
|
|
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ResolveMe] get(): R|A|
|
|
|
|
}
|
|
|
|
}
|
|
public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
|
|
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
|
|
super<R|kotlin/Any|>()
|
|
}
|
|
|
|
}
|