[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
).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
@@ -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
@@ -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 {
@@ -133,7 +133,6 @@ class ValueParameter(
isActual = modifiers.hasActual()
isOverride = modifiers.hasOverride()
isConst = modifiers.hasConst()
isLateInit = false
}
backingField = FirDefaultPropertyBackingField(
moduleData = moduleData,
@@ -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
@@ -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() }
@@ -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
}