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

[FIR] Fixed phase for FirCompanionGenerationProcessor to COMPANION_GENERATION

Browse Source 
Phase COMPILER_REQUIRED_ANNOTATIONS causes errors in the kotlinx serialization tests:

org.jetbrains.kotlin.fir.symbols.FirLazyResolveContractViolationException: `lazyResolveToPhase(COMPILER_REQUIRED_ANNOTATIONS)` cannot be called from a transformer with a phase COMPILER_REQUIRED_ANNOTATIONS.
`lazyResolveToPhase` can be called only from a transformer with a phase which is strictly greater than a requested phase;
 i.e., `lazyResolveToPhase(A)` may be only called from a lazy transformer with a phase B, where A < B. This is a contract of lazy resolve
This commit is contained in:
Sergey.Shanshin
2024-01-19 17:27:21 +01:00
committed by Space Team
parent 7af2aebbe2
commit 2ae2f09fee
44 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirCompanionGenerationProcessor.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.name.SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT
class FirCompanionGenerationProcessor( class FirCompanionGenerationProcessor(
session: FirSession, session: FirSession,
scopeSession: ScopeSession scopeSession: ScopeSession
) : FirTransformerBasedResolveProcessor(session, scopeSession, FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) { ) : FirTransformerBasedResolveProcessor(session, scopeSession, FirResolvePhase.COMPANION_GENERATION) {
override val transformer: FirTransformer<Nothing?> = FirCompanionGenerationTransformer(session) override val transformer: FirTransformer<Nothing?> = FirCompanionGenerationTransformer(session)
} }
plugins/kotlinx-serialization/testData/diagnostics/DuplicateSerialName.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// FILE: test.kt // FILE: test.kt
plugins/kotlinx-serialization/testData/diagnostics/EnumDuplicateSerialName.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/ExternalSerializers.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/GenericArrays.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/IncorrectTransient.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/IncorrectTransient2.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/InheritableInfo.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/LazyRecursionBug.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// This test enshures that analysis ends up without compiler exceptions // This test enshures that analysis ends up without compiler exceptions
plugins/kotlinx-serialization/testData/diagnostics/LocalAndAnonymous.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/NoSuitableCtorInParent.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// FILE: test.kt // FILE: test.kt
plugins/kotlinx-serialization/testData/diagnostics/NonSerializable.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
// FIR_IDENTICAL // FIR_IDENTICAL
// FILE: test.kt // FILE: test.kt
plugins/kotlinx-serialization/testData/diagnostics/NullabilityIncompatible.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// FILE: test.kt // FILE: test.kt
plugins/kotlinx-serialization/testData/diagnostics/ParamIsNotProperty.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// FILE: test.kt // FILE: test.kt
plugins/kotlinx-serialization/testData/diagnostics/SerializableEnums.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// FILE: test.kt // FILE: test.kt
plugins/kotlinx-serialization/testData/diagnostics/SerializableIgnored.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/SerializerTypeCompatibleForSpecials.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/SerializerTypeIncompatible.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/SerializerTypeIncompatible.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/SerializerTypeIncompatibleViaTypealias.fir.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
// MODULE: lib // MODULE: lib
plugins/kotlinx-serialization/testData/diagnostics/SerializerTypeIncompatibleViaTypealias.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
// MODULE: lib // MODULE: lib
plugins/kotlinx-serialization/testData/diagnostics/Transients.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// FILE: test.kt // FILE: test.kt
plugins/kotlinx-serialization/testData/diagnostics/abstractCustomSerializer.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// SKIP_TXT // SKIP_TXT
// WITH_STDLIB // WITH_STDLIB
plugins/kotlinx-serialization/testData/diagnostics/companionObjectSerializers.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/customSerializers.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// FILE: test.kt // FILE: test.kt
plugins/kotlinx-serialization/testData/diagnostics/externalSerialierJava.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/metaSerializableNested.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// FIR_IDENTICAL // FIR_IDENTICAL
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/serializerFromOtherModule.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// FIR_IDENTICAL // FIR_IDENTICAL
// WITH_STDLIB // WITH_STDLIB
// ISSUE: KT-57083 // ISSUE: KT-57083
plugins/kotlinx-serialization/testData/diagnostics/typeAliases.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// FIR_IDENTICAL // FIR_IDENTICAL
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/diagnostics/typeAliasesCustomized.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// FIR_IDENTICAL // FIR_IDENTICAL
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
// SKIP_TXT // SKIP_TXT
plugins/kotlinx-serialization/testData/firMembers/abstractAndSealed.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
import kotlinx.serialization.* import kotlinx.serialization.*
plugins/kotlinx-serialization/testData/firMembers/classWithCompanionObject.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
import kotlinx.serialization.* import kotlinx.serialization.*
plugins/kotlinx-serialization/testData/firMembers/classWithGenericParameters.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
import kotlinx.serialization.* import kotlinx.serialization.*
plugins/kotlinx-serialization/testData/firMembers/defaultProperties.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
import kotlinx.serialization.* import kotlinx.serialization.*
plugins/kotlinx-serialization/testData/firMembers/enums.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
plugins/kotlinx-serialization/testData/firMembers/externalSerializers.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
package com.example package com.example
plugins/kotlinx-serialization/testData/firMembers/inlineClasses.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
import kotlinx.serialization.* import kotlinx.serialization.*
plugins/kotlinx-serialization/testData/firMembers/metaSerializable.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
import kotlinx.serialization.* import kotlinx.serialization.*
plugins/kotlinx-serialization/testData/firMembers/multipleProperties.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
import kotlinx.serialization.* import kotlinx.serialization.*
plugins/kotlinx-serialization/testData/firMembers/privatePropertiesSerialization.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
/** /**
plugins/kotlinx-serialization/testData/firMembers/serializableObject.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
import kotlinx.serialization.* import kotlinx.serialization.*
plugins/kotlinx-serialization/testData/firMembers/serializableWith.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
import kotlinx.serialization.* import kotlinx.serialization.*
plugins/kotlinx-serialization/testData/firMembers/serializableWithCompanion.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
package com.example package com.example
plugins/kotlinx-serialization/testData/firMembers/serializerViaCompanion.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_DISABLE_LAZY_RESOLVE_CHECKS
// WITH_STDLIB // WITH_STDLIB
package com.example package com.example