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

FIR2IR: clean up dead code regarding overriding utils

Browse Source
This commit is contained in:
Jinseong Jeon
2020-10-14 11:33:13 -07:00
committed by Mikhail Glukhikh
parent 5f64d6ec76
commit b8817d5884
2 changed files with 0 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
-41
View File
@@ -268,47 +268,6 @@ internal fun FirProperty.generateOverriddenAccessorSymbols(
return overriddenSet.toList()
}
fun isOverriding(
irBuiltIns: IrBuiltIns,
target: IrDeclaration,
superCandidate: IrDeclaration
): Boolean {
val typeCheckerContext = IrTypeCheckerContext(irBuiltIns) as AbstractTypeCheckerContext
fun equalTypes(first: IrType, second: IrType): Boolean {
if (first is IrErrorType || second is IrErrorType) return false
return AbstractTypeChecker.equalTypes(
typeCheckerContext, first, second
) ||
// TODO: should pass type parameter cache, and make sure target type is indeed a matched type argument.
second.classifierOrNull is IrTypeParameterSymbol
}
return when {
target is IrFunction && superCandidate is IrFunction -> {
// Not checking the return type (they should match each other if everything other match, otherwise it's a compilation error)
target.name == superCandidate.name &&
target.extensionReceiverParameter?.type?.let {
val superCandidateReceiverType = superCandidate.extensionReceiverParameter?.type
superCandidateReceiverType != null && equalTypes(it, superCandidateReceiverType)
} != false &&
target.valueParameters.size == superCandidate.valueParameters.size &&
target.valueParameters.zip(superCandidate.valueParameters).all { (targetParameter, superCandidateParameter) ->
equalTypes(targetParameter.type, superCandidateParameter.type)
}
}
target is IrField && superCandidate is IrField -> {
// Not checking the field type (they should match each other if everything other match, otherwise it's a compilation error)
target.name == superCandidate.name
}
target is IrProperty && superCandidate is IrProperty -> {
// Not checking the property type (they should match each other if names match, otherwise it's a compilation error)
target.name == superCandidate.name
}
else -> false
}
}
private val nameToOperationConventionOrigin = mutableMapOf(
OperatorNameConventions.PLUS to IrStatementOrigin.PLUS,
OperatorNameConventions.MINUS to IrStatementOrigin.MINUS,
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
-14
View File
@@ -776,20 +776,6 @@ class Fir2IrDeclarationStorage(
return irField
}
internal fun findOverriddenFirFunction(irFunction: IrSimpleFunction, superClassId: ClassId): FirFunction<*>? {
val functions = getFirClassByFqName(superClassId)?.declarations?.filter {
it is FirFunction<*> && functionCache.containsKey(it) && irFunction.overrides(functionCache[it]!!)
}
return if (functions.isNullOrEmpty()) null else functions.first() as FirFunction<*>
}
internal fun findOverriddenFirProperty(irProperty: IrProperty, superClassId: ClassId): FirProperty? {
val properties = getFirClassByFqName(superClassId)?.declarations?.filter {
it is FirProperty && it.name == irProperty.name
}
return if (properties.isNullOrEmpty()) null else properties.first() as FirProperty
}
private fun getFirClassByFqName(classId: ClassId): FirClass<*>? {
val declaration = firSymbolProvider.getClassLikeSymbolByFqName(classId)
return declaration?.fir as? FirClass<*>