hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 12:46:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10189 from igfoo/igfoo/substituteTypeAndArguments

Browse Source 
Kotlin: Remove a cast from substituteTypeAndArguments
This commit is contained in:
Ian Lynagh
2022-08-30 11:51:39 +01:00
committed by GitHub
parent d6bdc8c711 131632e7c1
commit a5893f38c5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/kotlin-extractor/src/main/kotlin/utils/TypeSubstitution.kt
View File

@@ -123,14 +123,17 @@ private fun IrTypeArgument.lowerBound(context: IrPluginContext) =
fun IrType.substituteTypeAndArguments(substitutionMap: Map<IrTypeParameterSymbol, IrTypeArgument>?, useContext: KotlinUsesExtractor.TypeContext, pluginContext: IrPluginContext): IrType = fun IrType.substituteTypeAndArguments(substitutionMap: Map<IrTypeParameterSymbol, IrTypeArgument>?, useContext: KotlinUsesExtractor.TypeContext, pluginContext: IrPluginContext): IrType =
substitutionMap?.let { substMap -> substitutionMap?.let { substMap ->
this.classifierOrNull?.let { typeClassifier -> if (this is IrSimpleType) {
val typeClassifier = this.classifier
substMap[typeClassifier]?.let { substMap[typeClassifier]?.let {
when(useContext) { when(useContext) {
KotlinUsesExtractor.TypeContext.RETURN -> it.upperBound(pluginContext) KotlinUsesExtractor.TypeContext.RETURN -> it.upperBound(pluginContext)
else -> it.lowerBound(pluginContext) else -> it.lowerBound(pluginContext)
} }
} ?: (this as IrSimpleType).substituteTypeArguments(substMap) } ?: this.substituteTypeArguments(substMap)
} ?: this } else {
this
}
} ?: this } ?: this
object RawTypeAnnotation { object RawTypeAnnotation {