[LL FIR] rework transformers, so transformers resolve only a specific set of declarations

The change is needed for the parallel resolution (^KT-55750), so we can resolve the declaration under a lock that is specific to this declaration. Previously, if LL FIR was resolving some FirClass, LL FIR resolved all its children too, and it had no control over what parts of the FIR tree were modified. The same applied to the designation path, sometimes the classes on the designation path might be unexpectedly (and without lock) modified. This commit introduces LLFirResolveTarget, which specifies which exact declarations should be resolved during the lazy resolution of the declaration. All elements outside the declarations specified for resolve in LLFirResolveTarget, should not be modified. The logic of lazy transformers is the following: - Go to target declaration collecting all scopes from the file and containing classes - Resolve only declarations that are specified by the LLFirResolveTarget, performing the resolve under a separate lock for each declaration ^KT-56543 ^KT-57619 Fixed
2023-03-30 17:19:30 +02:00
parent 18a8cfb090
commit 72def186a3
545 changed files with 4297 additions and 2378 deletions
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 // http://youtrack.jetbrains.net/issue/KT-419

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 interface NoC {
  <!ANONYMOUS_INITIALIZER_IN_INTERFACE!>init<!> {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 //  !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER
 // TODO Uncomment all the examples when there will be no problems with light classes
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !DIAGNOSTICS: +UNUSED_PARAMETER
 import kotlin.reflect.KProperty

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !DIAGNOSTICS: +UNUSED_PARAMETER
 import kotlin.reflect.KProperty

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !DIAGNOSTICS: +UNUSED_VALUE, +UNUSED_CHANGED_VALUE, +UNUSED_PARAMETER, +UNUSED_VARIABLE

 package unused_variables
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !DIAGNOSTICS: +UNUSED_VALUE, +UNUSED_CHANGED_VALUE, +UNUSED_PARAMETER, +UNUSED_VARIABLE

 package unused_variables
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: -ClassTypeParameterAnnotations
@Target(AnnotationTarget.TYPE_PARAMETER)
 annotation class A1
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: -ClassTypeParameterAnnotations
@Target(AnnotationTarget.TYPE_PARAMETER)
 annotation class A1
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: +ClassTypeParameterAnnotations
 annotation class A1
 annotation class A2(val some: Int = 12)
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: +ClassTypeParameterAnnotations
 annotation class A1
 annotation class A2(val some: Int = 12)
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: +ProperCheckAnnotationsTargetInTypeUsePositions -ClassTypeParameterAnnotations

 annotation class A1
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: +ProperCheckAnnotationsTargetInTypeUsePositions -ClassTypeParameterAnnotations

 annotation class A1
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 // !LANGUAGE: +NestedClassesInAnnotations

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: -NestedClassesInAnnotations

 annotation class Annotation2() {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: -NestedClassesInAnnotations

 annotation class Annotation2() {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 // !LANGUAGE: +NestedClassesInAnnotations

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class A {
    @ann init {}
    @aaa init {}
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class A {
    <!WRONG_ANNOTATION_TARGET!>@ann<!> init {}
    <!WRONG_ANNOTATION_TARGET!>@<!UNRESOLVED_REFERENCE!>aaa<!><!> init {}
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 annotation class base

@base class My {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 annotation class base

@base class My {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 // !LANGUAGE: -ProhibitSimplificationOfNonTrivialConstBooleanExpressions
 package test
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 // !LANGUAGE: -ProhibitSimplificationOfNonTrivialConstBooleanExpressions
 package test
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class My(val v: Int) {
    // Ok: setter is just private
    var x: Int
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class My(val v: Int) {
    // Ok: setter is just private
    var x: Int
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 abstract class My(val v: Int) {
    // Ok: variable is just abstract
    abstract var x: Int
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 abstract class My(val v: Int) {
    // Ok: variable is just abstract
    abstract var x: Int
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 package test

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 package test

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_EXPRESSION

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 // !CHECK_TYPE

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 // !LANGUAGE: +ProhibitTypeParametersInClassLiteralsInAnnotationArguments

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 annotation class Foo(val a: IntArray, val b: Array<String>, val c: FloatArray)

@Foo([1], ["/"], [1f])
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 annotation class Foo(val a: IntArray, val b: Array<String>, val c: FloatArray)

@Foo([1], ["/"], [1f])
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class My {
    var x = 1
        set(value) {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class My {
    var x = 1
        set(value) {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class My {
    val x: String

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class My {
    val x: String

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 interface Base {
    val x: Int
 }
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 interface Base {
    val x: Int
 }
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class My(var x: String) {

    var y: String
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class My(var x: String) {

    var y: String
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class My {
    val x: String

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class My {
    val x: String

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL

 private const val A = 0L
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class My {
    val x: Int
        get() = field + if (z != "") 1 else 0
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class My {
    val x: Int
        get() = field + if (z != "") 1 else 0
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class First {
    val x: String

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class First {
    val x: String

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 class WithLateInit {
    lateinit var x: String
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 class My {

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 open class Base {
    init {
        register(this)
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 open class Base {
    init {
        register(<!DEBUG_INFO_LEAKING_THIS!>this<!>)
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 package uninitialized_reassigned_variables

 fun doSmth(s: String) {}
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 package uninitialized_reassigned_variables

 fun doSmth(<!UNUSED_PARAMETER!>s<!>: String) {}
@@ -1,6 +1,4 @@
 // DIAGNOSTICS: -UNUSED_VARIABLE
-// IGNORE_REVERSED_RESOLVE
-//  Ignore reason: KT-57619
 // WITH_STDLIB
 // ISSUE: KT-57456, KT-57608
@file:OptIn(ExperimentalContracts::class)
@@ -1,6 +1,4 @@
 // DIAGNOSTICS: -UNUSED_VARIABLE
-// IGNORE_REVERSED_RESOLVE
-//  Ignore reason: KT-57619
 // WITH_STDLIB
 // ISSUE: KT-57456, KT-57608
@file:OptIn(ExperimentalContracts::class)
@@ -1,6 +1,4 @@
 // DIAGNOSTICS: -UNUSED_VARIABLE
-// IGNORE_REVERSED_RESOLVE
-//  Ignore reason: KT-57619
 // WITH_STDLIB
 // ISSUE: KT-57456, KT-57608
@file:OptIn(ExperimentalContracts::class)
@@ -1,6 +1,4 @@
 // DIAGNOSTICS: -UNUSED_VARIABLE
-// IGNORE_REVERSED_RESOLVE
-//  Ignore reason: KT-57619
 // WITH_STDLIB
 // ISSUE: KT-57456, KT-57608
@file:OptIn(ExperimentalContracts::class)
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // Tests for KT-13597 (val assignment inside local object in constructor)

 class Test {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // Tests for KT-13597 (val assignment inside local object in constructor)

 class Test {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // DIAGNOSTICS: -UNUSED_PARAMETER
 // WITH_STDLIB

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // DIAGNOSTICS: -UNUSED_PARAMETER
 // WITH_STDLIB

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // DIAGNOSTICS: -UNUSED_PARAMETER

 import kotlin.reflect.KProperty
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // DIAGNOSTICS: -UNUSED_PARAMETER

 import kotlin.reflect.KProperty
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // ISSUE: KT-10869, KT-56682

 import kotlin.reflect.KProperty
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // ISSUE: KT-10869, KT-56682

 import kotlin.reflect.KProperty
@@ -1,5 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
-//  Ignore reason: KT-57619
 enum class B(val x: Int) {
    B1(1),
    B2(2);
@@ -1,5 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
-//  Ignore reason: KT-57619
 enum class B(val x: Int) {
    B1(1),
    B2(2);
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseCallsInPlaceEffect
 // !OPT_IN: kotlin.internal.ContractsDsl

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseCallsInPlaceEffect
 // !OPT_IN: kotlin.internal.ContractsDsl

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE

 fun ignoreIt(f: () -> Unit) {}
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE

 fun ignoreIt(<!UNUSED_PARAMETER!>f<!>: () -> Unit) {}
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE

 fun foo() {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE

 fun foo() {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: +ReadDeserializedContracts +UseCallsInPlaceEffect
 // See KT-17479

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: +ReadDeserializedContracts +UseCallsInPlaceEffect
 // See KT-17479

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: -ReadDeserializedContracts -UseCallsInPlaceEffect
 // See KT-17479

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !LANGUAGE: -ReadDeserializedContracts -UseCallsInPlaceEffect
 // See KT-17479

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 //KT-2330 Check visibility of getters and setters correspondingly
 package a

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 //KT-2330 Check visibility of getters and setters correspondingly
 package a

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 //KT-4405 Control-flow analysis is not performed for some local declarations

 package d
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 //KT-4405 Control-flow analysis is not performed for some local declarations

 package d
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 //KT-510 `this.` allows initialization without backing field

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class A(val next: A? = null) {
    <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val x: String<!>
    init {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class A(val next: A? = null) {
    <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val x: String<!>
    init {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 //KT-897 Don't allow assignment to a property before it is defined

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class A(val next: A? = null) {
    val x: String
    init {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class A(val next: A? = null) {
    val x: String
    init {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class Outer {
    <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val outerProp: String<!>
    inner class Inner(inner: Inner, outer: Outer) {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class Outer {
    <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val outerProp: String<!>
    inner class Inner(inner: Inner, outer: Outer) {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class A(val next: A? = null) {
    val x: String
    init {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 class A(val next: A? = null) {
    val x: String
    init {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 package o

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 package o

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 package aa

 val a : Int = b
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 package aa

 val a : Int = <!UNINITIALIZED_VARIABLE!>b<!>
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 class AnonymousInitializers(var a: String) {
    init {
@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 // ISSUE: KT-56678

@@ -1,4 +1,3 @@
-// IGNORE_REVERSED_RESOLVE
 // FIR_IDENTICAL
 // LANGUAGE: +ProhibitQualifiedAccessToUninitializedEnumEntry
 // ISSUE: KT-41124
--- a/Show More
+++ b/Show More