diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt index a54b61992e7..f4b79f1390b 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt @@ -54,7 +54,7 @@ class FirJavaClass internal constructor( status.isInline = false } - override var resolvePhase: FirResolvePhase = FirResolvePhase.DECLARATIONS + override var resolvePhase: FirResolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES override val superTypeRefs = mutableListOf() diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt index 376941aec57..7e261beacc5 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt @@ -49,7 +49,7 @@ class FirJavaConstructor( this.isInner = isInner } - override var resolvePhase: FirResolvePhase = FirResolvePhase.DECLARATIONS + override var resolvePhase: FirResolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES init { symbol.bind(this) @@ -116,4 +116,4 @@ class FirJavaConstructor( override fun replaceReturnTypeRef(newReturnTypeRef: FirTypeRef) { returnTypeRef = newReturnTypeRef } -} \ No newline at end of file +} diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt index 2f885952a90..f72bc323258 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt @@ -46,7 +46,7 @@ class FirJavaField( isOverride = false } override val receiverTypeRef: FirTypeRef? get() = null - override var resolvePhase: FirResolvePhase = FirResolvePhase.DECLARATIONS + override var resolvePhase: FirResolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES override val isVal: Boolean = true override val getter: FirPropertyAccessor? get() = null override val setter: FirPropertyAccessor? get() = null @@ -115,4 +115,4 @@ class FirJavaField( override fun transformInitializer(transformer: FirTransformer, data: D): FirField { return this } -} \ No newline at end of file +} diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt index 3b1f1fb4273..3e5b2b1b775 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl import org.jetbrains.kotlin.fir.declarations.impl.FirSimpleFunctionImpl -import org.jetbrains.kotlin.fir.types.jvm.FirJavaTypeRef import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol +import org.jetbrains.kotlin.fir.types.jvm.FirJavaTypeRef import org.jetbrains.kotlin.name.Name class FirJavaMethod( @@ -46,6 +46,6 @@ class FirJavaMethod( symbol ) { init { - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES } -} \ No newline at end of file +} diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt index c903fe43cec..430735d7fa4 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl -import org.jetbrains.kotlin.fir.types.jvm.FirJavaTypeRef import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol +import org.jetbrains.kotlin.fir.types.jvm.FirJavaTypeRef import org.jetbrains.kotlin.name.Name class FirJavaValueParameter( @@ -31,6 +31,6 @@ class FirJavaValueParameter( isVararg = isVararg ) { init { - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES } -} \ No newline at end of file +} diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassEnhancementScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassEnhancementScope.kt index 12dabe873ee..1dee4b3803d 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassEnhancementScope.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassEnhancementScope.kt @@ -181,7 +181,7 @@ class JavaClassEnhancementScope( FirVariableSymbol(this.name), defaultValue ?: newDefaultValue, isCrossinline, isNoinline, isVararg ).apply { - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES annotations += valueParameter.annotations } } @@ -213,7 +213,7 @@ class JavaClassEnhancementScope( symbol ) }.apply { - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES this.valueParameters += newValueParameters this.typeParameters += firMethod.typeParameters } @@ -228,7 +228,7 @@ class JavaClassEnhancementScope( if (!isAccessor) FirNamedFunctionSymbol(methodId) else FirAccessorSymbol(callableId = propertyId!!, accessorId = methodId) ).apply { - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES this.valueParameters += newValueParameters this.typeParameters += firMethod.typeParameters } @@ -383,4 +383,4 @@ class JavaClassEnhancementScope( ) } -} \ No newline at end of file +} diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt index f9d72769d56..f8a303531e8 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt @@ -17,7 +17,8 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirEnumEntryImpl import org.jetbrains.kotlin.fir.declarations.impl.FirSealedClassImpl import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider import org.jetbrains.kotlin.fir.symbols.CallableId -import org.jetbrains.kotlin.fir.symbols.impl.* +import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol +import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl import org.jetbrains.kotlin.fir.types.impl.FirResolvedTypeRefImpl import org.jetbrains.kotlin.metadata.ProtoBuf @@ -78,7 +79,7 @@ fun deserializeClassToSymbol( ) } firClass.apply { - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES val context = parentContext?.childContext( classProto.typeParameterList, @@ -136,7 +137,7 @@ fun deserializeClassToSymbol( isStatic = true } ).apply { - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES } property diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt index d26ae6a8fe3..67f71c4f1e8 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt @@ -146,7 +146,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { local.typeDeserializer.type(proto.underlyingType(c.typeTable)) ) ).apply { - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES typeParameters += local.typeDeserializer.ownTypeParameters.map { it.fir } } } @@ -184,7 +184,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { false, status ).apply { - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES typeParameters += local.typeDeserializer.ownTypeParameters.map { it.fir } annotations += c.annotationDeserializer.loadPropertyAnnotations(proto, local.nameResolver) getter = FirDefaultPropertyGetter(null, c.session, returnTypeRef, ProtoEnumFlags.visibility(Flags.VISIBILITY.get(getterFlags))) @@ -234,7 +234,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { status, symbol ).apply { - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES typeParameters += local.typeDeserializer.ownTypeParameters.map { it.fir } valueParameters += local.memberDeserializer.valueParameters(proto.valueParameterList) annotations += local.annotationDeserializer.loadFunctionAnnotations(proto, local.nameResolver) @@ -290,7 +290,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { symbol ) }.apply { - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES this.typeParameters += typeParameters valueParameters += local.memberDeserializer.valueParameters(proto.valueParameterList) annotations += local.annotationDeserializer.loadConstructorAnnotations(proto, local.nameResolver) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirBuiltinSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirBuiltinSymbolProvider.kt index 6262cc41b3a..cfba6fb1be1 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirBuiltinSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirBuiltinSymbolProvider.kt @@ -166,7 +166,7 @@ class FirBuiltinSymbolProvider(val session: FirSession, val kotlinScopeProvider: kotlinScopeProvider, this ).apply klass@{ - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES typeParameters.addAll((1..arity).map { FirTypeParameterImpl( null, @@ -222,7 +222,7 @@ class FirBuiltinSymbolProvider(val session: FirSession, val kotlinScopeProvider: functionStatus, FirNamedFunctionSymbol(CallableId(packageFqName, relativeClassName, name)) ).apply { - resolvePhase = FirResolvePhase.DECLARATIONS + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES valueParameters += typeArguments.dropLast(1).mapIndexed { index, typeArgument -> val parameterName = Name.identifier("p${index + 1}") FirValueParameterImpl( diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt index 355171fa6e6..bd62e6a6272 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt @@ -22,5 +22,6 @@ enum class FirResolvePhase { companion object { // Short-cut val DECLARATIONS = STATUS + val ANALYZED_DEPENDENCIES = BODY_RESOLVE } -} \ No newline at end of file +}