[FIR] Remove redundant setting of DeclarationStatus properties

This commit is contained in:
Kirill Rakhman
2023-02-01 18:11:37 +01:00
committed by Space Team
parent d204d65174
commit 152e63b198
7 changed files with 2 additions and 58 deletions
@@ -284,9 +284,6 @@ abstract class FirJavaFacade(
effectiveVisibility effectiveVisibility
).apply { ).apply {
this.isInner = !isTopLevel && !this@buildJavaClass.isStatic this.isInner = !isTopLevel && !this@buildJavaClass.isStatic
isCompanion = false
isData = false
isInline = false
isFun = classKind == ClassKind.INTERFACE isFun = classKind == ClassKind.INTERFACE
} }
// TODO: may be we can process fields & methods later. // TODO: may be we can process fields & methods later.
@@ -496,9 +493,6 @@ abstract class FirJavaFacade(
javaField.visibility.toEffectiveVisibility(dispatchReceiver.lookupTag) javaField.visibility.toEffectiveVisibility(dispatchReceiver.lookupTag)
).apply { ).apply {
isStatic = javaField.isStatic isStatic = javaField.isStatic
isExpect = false
isActual = false
isOverride = false
} }
returnTypeRef = returnType.toFirJavaTypeRef(session, javaTypeParameterStack) returnTypeRef = returnType.toFirJavaTypeRef(session, javaTypeParameterStack)
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
@@ -520,9 +514,6 @@ abstract class FirJavaFacade(
javaField.visibility.toEffectiveVisibility(dispatchReceiver.lookupTag) javaField.visibility.toEffectiveVisibility(dispatchReceiver.lookupTag)
).apply { ).apply {
isStatic = javaField.isStatic isStatic = javaField.isStatic
isExpect = false
isActual = false
isOverride = false
} }
visibility = javaField.visibility visibility = javaField.visibility
modality = javaField.modality modality = javaField.modality
@@ -578,17 +569,9 @@ abstract class FirJavaFacade(
javaMethod.visibility.toEffectiveVisibility(dispatchReceiver.lookupTag) javaMethod.visibility.toEffectiveVisibility(dispatchReceiver.lookupTag)
).apply { ).apply {
isStatic = javaMethod.isStatic 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 // 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) // We need here more detailed checks (see modifierChecks.kt)
isOperator = name in ALL_JAVA_OPERATION_NAMES || OperatorNameConventions.COMPONENT_REGEX.matches(name.asString()) 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) { if (!javaMethod.isStatic) {
@@ -644,9 +627,6 @@ abstract class FirJavaFacade(
Modality.FINAL, Modality.FINAL,
visibility.toEffectiveVisibility(ownerClassBuilder.symbol) visibility.toEffectiveVisibility(ownerClassBuilder.symbol)
).apply { ).apply {
isExpect = false
isActual = false
isOverride = false
isInner = isThisInner isInner = isThisInner
} }
this.visibility = visibility this.visibility = visibility
@@ -261,9 +261,6 @@ class FirSignatureEnhancement(
} else { } else {
FirDeclarationStatusImpl(firMethod.visibility, Modality.FINAL) FirDeclarationStatusImpl(firMethod.visibility, Modality.FINAL)
}.apply { }.apply {
isExpect = false
isActual = false
isOverride = false
isInner = firMethod.isInner isInner = firMethod.isInner
} }
this.symbol = symbol this.symbol = symbol
@@ -121,14 +121,7 @@ abstract class FirSyntheticFunctionInterfaceProviderBase(
Visibilities.Public, Visibilities.Public,
Modality.ABSTRACT, Modality.ABSTRACT,
EffectiveVisibility.Public EffectiveVisibility.Public
).apply { )
isExpect = false
isActual = false
isInner = false
isCompanion = false
isData = false
isInline = false
}
classKind = ClassKind.INTERFACE classKind = ClassKind.INTERFACE
scopeProvider = kotlinScopeProvider scopeProvider = kotlinScopeProvider
symbol = this@symbol symbol = this@symbol
@@ -167,14 +160,7 @@ abstract class FirSyntheticFunctionInterfaceProviderBase(
Modality.ABSTRACT, Modality.ABSTRACT,
EffectiveVisibility.Public EffectiveVisibility.Public
).apply { ).apply {
isExpect = false
isActual = false
isOverride = false
isOperator = true isOperator = true
isInfix = false
isInline = false
isTailRec = false
isExternal = false
isSuspend = kind.isSuspendOrKSuspendFunction isSuspend = kind.isSuspendOrKSuspendFunction
} }
val typeArguments = typeParameters.map { val typeArguments = typeParameters.map {
@@ -133,7 +133,6 @@ class ValueParameter(
isActual = modifiers.hasActual() isActual = modifiers.hasActual()
isOverride = modifiers.hasOverride() isOverride = modifiers.hasOverride()
isConst = modifiers.hasConst() isConst = modifiers.hasConst()
isLateInit = false
} }
backingField = FirDefaultPropertyBackingField( backingField = FirDefaultPropertyBackingField(
moduleData = moduleData, moduleData = moduleData,
@@ -621,7 +621,6 @@ open class RawFirBuilder(
isActual = hasActualModifier() isActual = hasActualModifier()
isOverride = hasModifier(OVERRIDE_KEYWORD) isOverride = hasModifier(OVERRIDE_KEYWORD)
isConst = hasModifier(CONST_KEYWORD) isConst = hasModifier(CONST_KEYWORD)
isLateInit = false
} }
val propertySource = toFirSourceElement(KtFakeSourceElementKind.PropertyFromParameter) val propertySource = toFirSourceElement(KtFakeSourceElementKind.PropertyFromParameter)
val propertyName = nameAsSafeName val propertyName = nameAsSafeName
@@ -165,13 +165,6 @@ class FirSamResolver(
).apply { ).apply {
isExpect = firRegularClass.isExpect isExpect = firRegularClass.isExpect
isActual = firRegularClass.isActual isActual = firRegularClass.isActual
isOverride = false
isOperator = false
isInfix = false
isExternal = false
isInline = false
isSuspend = false
isTailRec = false
} }
this.symbol = syntheticFunctionSymbol this.symbol = syntheticFunctionSymbol
typeParameters += newTypeParameters.map { it.build() } typeParameters += newTypeParameters.map { it.build() }
@@ -347,17 +347,7 @@ class FirSyntheticCallGenerator(
origin = FirDeclarationOrigin.Synthetic origin = FirDeclarationOrigin.Synthetic
this.symbol = symbol this.symbol = symbol
this.name = name this.name = name
status = FirDeclarationStatusImpl(Visibilities.Public, Modality.FINAL).apply { status = FirDeclarationStatusImpl(Visibilities.Public, Modality.FINAL)
isExpect = false
isActual = false
isOverride = false
isOperator = false
isInfix = false
isInline = false
isTailRec = false
isExternal = false
isSuspend = false
}
returnTypeRef = returnType returnTypeRef = returnType
resolvePhase = FirResolvePhase.BODY_RESOLVE resolvePhase = FirResolvePhase.BODY_RESOLVE
} }