diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt index b2298896427..084c2500247 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt @@ -284,9 +284,6 @@ abstract class FirJavaFacade( effectiveVisibility ).apply { this.isInner = !isTopLevel && !this@buildJavaClass.isStatic - isCompanion = false - isData = false - isInline = false isFun = classKind == ClassKind.INTERFACE } // TODO: may be we can process fields & methods later. @@ -496,9 +493,6 @@ abstract class FirJavaFacade( javaField.visibility.toEffectiveVisibility(dispatchReceiver.lookupTag) ).apply { isStatic = javaField.isStatic - isExpect = false - isActual = false - isOverride = false } returnTypeRef = returnType.toFirJavaTypeRef(session, javaTypeParameterStack) resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES @@ -520,9 +514,6 @@ abstract class FirJavaFacade( javaField.visibility.toEffectiveVisibility(dispatchReceiver.lookupTag) ).apply { isStatic = javaField.isStatic - isExpect = false - isActual = false - isOverride = false } visibility = javaField.visibility modality = javaField.modality @@ -578,17 +569,9 @@ abstract class FirJavaFacade( javaMethod.visibility.toEffectiveVisibility(dispatchReceiver.lookupTag) ).apply { isStatic = javaMethod.isStatic - isExpect = false - isActual = false - isOverride = false // Approximation: all Java methods with name that allows to use it in operator form are considered operators // We need here more detailed checks (see modifierChecks.kt) isOperator = name in ALL_JAVA_OPERATION_NAMES || OperatorNameConventions.COMPONENT_REGEX.matches(name.asString()) - isInfix = false - isInline = false - isTailRec = false - isExternal = false - isSuspend = false } if (!javaMethod.isStatic) { @@ -644,9 +627,6 @@ abstract class FirJavaFacade( Modality.FINAL, visibility.toEffectiveVisibility(ownerClassBuilder.symbol) ).apply { - isExpect = false - isActual = false - isOverride = false isInner = isThisInner } this.visibility = visibility diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt index b1ccc4f2197..27f544f7931 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt @@ -261,9 +261,6 @@ class FirSignatureEnhancement( } else { FirDeclarationStatusImpl(firMethod.visibility, Modality.FINAL) }.apply { - isExpect = false - isActual = false - isOverride = false isInner = firMethod.isInner } this.symbol = symbol diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirExtensionSyntheticFunctionInterfaceProvider.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirExtensionSyntheticFunctionInterfaceProvider.kt index e759ce64e80..8c6788e3151 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirExtensionSyntheticFunctionInterfaceProvider.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirExtensionSyntheticFunctionInterfaceProvider.kt @@ -121,14 +121,7 @@ abstract class FirSyntheticFunctionInterfaceProviderBase( Visibilities.Public, Modality.ABSTRACT, EffectiveVisibility.Public - ).apply { - isExpect = false - isActual = false - isInner = false - isCompanion = false - isData = false - isInline = false - } + ) classKind = ClassKind.INTERFACE scopeProvider = kotlinScopeProvider symbol = this@symbol @@ -167,14 +160,7 @@ abstract class FirSyntheticFunctionInterfaceProviderBase( Modality.ABSTRACT, EffectiveVisibility.Public ).apply { - isExpect = false - isActual = false - isOverride = false isOperator = true - isInfix = false - isInline = false - isTailRec = false - isExternal = false isSuspend = kind.isSuspendOrKSuspendFunction } val typeArguments = typeParameters.map { diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt index 945175acd4f..59306118f6d 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt @@ -133,7 +133,6 @@ class ValueParameter( isActual = modifiers.hasActual() isOverride = modifiers.hasOverride() isConst = modifiers.hasConst() - isLateInit = false } backingField = FirDefaultPropertyBackingField( moduleData = moduleData, diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index 24631cca367..9bfaa5bd584 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -621,7 +621,6 @@ open class RawFirBuilder( isActual = hasActualModifier() isOverride = hasModifier(OVERRIDE_KEYWORD) isConst = hasModifier(CONST_KEYWORD) - isLateInit = false } val propertySource = toFirSourceElement(KtFakeSourceElementKind.PropertyFromParameter) val propertyName = nameAsSafeName diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt index e7db400d22d..0ba6986a3e7 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt @@ -165,13 +165,6 @@ class FirSamResolver( ).apply { isExpect = firRegularClass.isExpect isActual = firRegularClass.isActual - isOverride = false - isOperator = false - isInfix = false - isExternal = false - isInline = false - isSuspend = false - isTailRec = false } this.symbol = syntheticFunctionSymbol typeParameters += newTypeParameters.map { it.build() } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt index 45f1a8a1c17..b8356fc3f04 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt @@ -347,17 +347,7 @@ class FirSyntheticCallGenerator( origin = FirDeclarationOrigin.Synthetic this.symbol = symbol this.name = name - status = FirDeclarationStatusImpl(Visibilities.Public, Modality.FINAL).apply { - isExpect = false - isActual = false - isOverride = false - isOperator = false - isInfix = false - isInline = false - isTailRec = false - isExternal = false - isSuspend = false - } + status = FirDeclarationStatusImpl(Visibilities.Public, Modality.FINAL) returnTypeRef = returnType resolvePhase = FirResolvePhase.BODY_RESOLVE }