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

Effective modality cleanup. Drop unnecessary @Suppress and final

Browse Source 
They were needed as a temporary migration in scope of KT-58587

Now the bootstrap and IDE include KT-58587 patch, so @Suppress and
`final` are no longer needed
This commit is contained in:
Nikita Bobko
2023-07-26 10:51:31 +02:00
committed by Space Team
parent fefa72fa29
commit 8c795462e1
1 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/IrBuiltInsOverFir.kt
+15 -30
View File
@@ -375,29 +375,18 @@ class IrBuiltInsOverFir(
override val ieee754equalsFunByOperandType: MutableMap<IrClassifierSymbol, IrSimpleFunctionSymbol> override val ieee754equalsFunByOperandType: MutableMap<IrClassifierSymbol, IrSimpleFunctionSymbol>
get() = _ieee754equalsFunByOperandType get() = _ieee754equalsFunByOperandType
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update override var eqeqeqSymbol: IrSimpleFunctionSymbol private set
final override var eqeqeqSymbol: IrSimpleFunctionSymbol private set override var eqeqSymbol: IrSimpleFunctionSymbol private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update override var throwCceSymbol: IrSimpleFunctionSymbol private set
final override var eqeqSymbol: IrSimpleFunctionSymbol private set override var throwIseSymbol: IrSimpleFunctionSymbol private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update override var andandSymbol: IrSimpleFunctionSymbol private set
final override var throwCceSymbol: IrSimpleFunctionSymbol private set override var ororSymbol: IrSimpleFunctionSymbol private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update override var noWhenBranchMatchedExceptionSymbol: IrSimpleFunctionSymbol private set
final override var throwIseSymbol: IrSimpleFunctionSymbol private set override var illegalArgumentExceptionSymbol: IrSimpleFunctionSymbol private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update override var dataClassArrayMemberHashCodeSymbol: IrSimpleFunctionSymbol private set
final override var andandSymbol: IrSimpleFunctionSymbol private set override var dataClassArrayMemberToStringSymbol: IrSimpleFunctionSymbol private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update
final override var ororSymbol: IrSimpleFunctionSymbol private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update
final override var noWhenBranchMatchedExceptionSymbol: IrSimpleFunctionSymbol private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update
final override var illegalArgumentExceptionSymbol: IrSimpleFunctionSymbol private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update
final override var dataClassArrayMemberHashCodeSymbol: IrSimpleFunctionSymbol private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update
final override var dataClassArrayMemberToStringSymbol: IrSimpleFunctionSymbol private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update override var checkNotNullSymbol: IrSimpleFunctionSymbol private set
final override var checkNotNullSymbol: IrSimpleFunctionSymbol private set
override val arrayOfNulls: IrSimpleFunctionSymbol by lazy { override val arrayOfNulls: IrSimpleFunctionSymbol by lazy {
findFunctions(kotlinPackage, Name.identifier("arrayOfNulls")).first { findFunctions(kotlinPackage, Name.identifier("arrayOfNulls")).first {
it.owner.dispatchReceiverParameter == null && it.owner.valueParameters.size == 1 && it.owner.dispatchReceiverParameter == null && it.owner.valueParameters.size == 1 &&
@@ -408,14 +397,10 @@ class IrBuiltInsOverFir(
override val linkageErrorSymbol: IrSimpleFunctionSymbol override val linkageErrorSymbol: IrSimpleFunctionSymbol
get() = TODO("Not yet implemented") get() = TODO("Not yet implemented")
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update override var lessFunByOperandType: Map<IrClassifierSymbol, IrSimpleFunctionSymbol> private set
final override var lessFunByOperandType: Map<IrClassifierSymbol, IrSimpleFunctionSymbol> private set override var lessOrEqualFunByOperandType: Map<IrClassifierSymbol, IrSimpleFunctionSymbol> private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update override var greaterOrEqualFunByOperandType: Map<IrClassifierSymbol, IrSimpleFunctionSymbol> private set
final override var lessOrEqualFunByOperandType: Map<IrClassifierSymbol, IrSimpleFunctionSymbol> private set override var greaterFunByOperandType: Map<IrClassifierSymbol, IrSimpleFunctionSymbol> private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update
final override var greaterOrEqualFunByOperandType: Map<IrClassifierSymbol, IrSimpleFunctionSymbol> private set
@Suppress("RedundantModalityModifier") // Explicit `final` keyword can be dropped after bootstrap update
final override var greaterFunByOperandType: Map<IrClassifierSymbol, IrSimpleFunctionSymbol> private set
init { init {
with(this.operatorsPackageFragment) { with(this.operatorsPackageFragment) {