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

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

Browse Source 
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
This commit is contained in:
Dmitrii Gridin
2023-03-30 17:19:30 +02:00
committed by Space Team
parent 18a8cfb090
commit 72def186a3
545 changed files with 4297 additions and 2378 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/scopes/genericVsNested.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
class A<T> {
class T
compiler/testData/diagnostics/tests/scopes/inheritance/companionObject.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
interface A {
compiler/testData/diagnostics/tests/scopes/inheritance/companionObject.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
interface A {
compiler/testData/diagnostics/tests/scopes/inheritance/companionObjectAfterJava.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: 1.kt
compiler/testData/diagnostics/tests/scopes/inheritance/companionObjectAfterJava.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: 1.kt
compiler/testData/diagnostics/tests/scopes/inheritance/companionObjectsOrder.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_VARIABLE
open class A {
compiler/testData/diagnostics/tests/scopes/inheritance/innerClasses.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
open class A {
compiler/testData/diagnostics/tests/scopes/inheritance/innerClasses.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
open class A {
compiler/testData/diagnostics/tests/scopes/inheritance/kt3856.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
fun foo(init: A.() -> Unit) { }
compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !DIAGNOSTICS: -UNUSED_VARIABLE
// FILE: A.java
public class A {
compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !DIAGNOSTICS: -UNUSED_VARIABLE
// FILE: A.java
public class A {
compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClass.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
open class A {
compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
open class A {
compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNested.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
open class A {
compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNested.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
open class A {
compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNestedJava.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: 1.kt
compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNestedJava.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: 1.kt
compiler/testData/diagnostics/tests/scopes/inheritance/nestedFromJava.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// FILE: A.java
public interface A {
compiler/testData/diagnostics/tests/scopes/inheritance/nestedFromJavaAfterKotlin.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// FILE: A.java
public interface A {
compiler/testData/diagnostics/tests/scopes/inheritance/nestedVsToplevelClass.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
class X {
compiler/testData/diagnostics/tests/scopes/inheritance/nestedVsToplevelClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
class X {
compiler/testData/diagnostics/tests/scopes/inheritance/severalCompanions.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_VARIABLE
open class A {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClassJKJ_after.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: J.java
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClassJKJ_before.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: J.java
public class J {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClassJKJ_before.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: J.java
public class J {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClass_after.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: J.java
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClass_before.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: J.java
public class J {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClass_before.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: J.java
public class J {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// !DIAGNOSTICS: -UNUSED_VARIABLE
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// !DIAGNOSTICS: -UNUSED_VARIABLE
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// !DIAGNOSTICS: -UNUSED_VARIABLE
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// !DIAGNOSTICS: -UNUSED_VARIABLE
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJavaAfterKotlin_after.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: J.java
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJavaAfterKotlin_before.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: J.java
public class J {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJavaAfterKotlin_before.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: J.java
public class J {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJava_after.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: J.java
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJava_before.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: J.java
public class J {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJava_before.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// FILE: J.java
public class J {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !DIAGNOSTICS: -UNUSED_VARIABLE
// FILE: A.java
public class A {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !DIAGNOSTICS: -UNUSED_VARIABLE
// FILE: A.java
public class A {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/overloadStatic.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_VARIABLE
// FILE: A.java
compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticFunVsImport.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_VARIABLE
// FILE: A.java
compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticPropertyVsImport.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_VARIABLE
// FILE: A.java
compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsCompanion.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_VARIABLE
// FILE: A.java
compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsMember.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !DIAGNOSTICS: -UNUSED_VARIABLE
// FILE: A.java
public class A {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsMember.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !DIAGNOSTICS: -UNUSED_VARIABLE
// FILE: A.java
public class A {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsOuter.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// FILE: A.java
public class A {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticsFromjava.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// FILE: A.java
public class A {
compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticsFromjavaAfterKotlin.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// FILE: A.java
public class A {
compiler/testData/diagnostics/tests/scopes/invisibleInternalSetterAccessFromDeriviedClass.fir.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE:-ProhibitAccessToInvisibleSetterFromDerivedClass
// IGNORE_REVERSED_RESOLVE
// MODULE: m1
// FILE: base.kt
compiler/testData/diagnostics/tests/scopes/invisibleInternalSetterAccessFromDeriviedClass.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE:-ProhibitAccessToInvisibleSetterFromDerivedClass
// IGNORE_REVERSED_RESOLVE
// MODULE: m1
// FILE: base.kt
compiler/testData/diagnostics/tests/scopes/invisibleInternalSetterAccessFromDeriviedClassOn.fir.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE:+ProhibitAccessToInvisibleSetterFromDerivedClass
// IGNORE_REVERSED_RESOLVE
// MODULE: m1
// FILE: base.kt
compiler/testData/diagnostics/tests/scopes/invisibleInternalSetterAccessFromDeriviedClassOn.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE:+ProhibitAccessToInvisibleSetterFromDerivedClass
// IGNORE_REVERSED_RESOLVE
// MODULE: m1
// FILE: base.kt
compiler/testData/diagnostics/tests/scopes/kt1244.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
//KT-1244 Frontend allows access to private members of other classes
package kt1244
compiler/testData/diagnostics/tests/scopes/kt1244.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
//KT-1244 Frontend allows access to private members of other classes
package kt1244
compiler/testData/diagnostics/tests/scopes/kt37.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
//KT-37 Typechecker doesn't complain about accessing non-public property
package kt37
compiler/testData/diagnostics/tests/scopes/kt37.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
//KT-37 Typechecker doesn't complain about accessing non-public property
package kt37
compiler/testData/diagnostics/tests/scopes/protectedVisibility/complexCompanion.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
open class A {
protected fun foo() {}
compiler/testData/diagnostics/tests/scopes/protectedVisibility/complexCompanion.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
open class A {
protected fun foo() {}
compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructor.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !DIAGNOSTICS: -UNUSED_PARAMETER
open class A protected constructor(x: Int) {
compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructor.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !DIAGNOSTICS: -UNUSED_PARAMETER
open class A protected constructor(x: Int) {
compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructorJavaDifferentPackage.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !DIAGNOSTICS: -UNUSED_PARAMETER
// FILE: abc/A.java
compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructorJavaDifferentPackage.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// !DIAGNOSTICS: -UNUSED_PARAMETER
// FILE: abc/A.java
compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructorJavaSamePackage.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_REVERSED_RESOLVE
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER