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

Kotlin: Remove useTypeOld

Browse Source
This commit is contained in:
Ian Lynagh
2021-11-03 17:52:00 +00:00
parent e61ff60bf8
commit 9b3f36d1ae
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
View File

@@ -287,10 +287,6 @@ open class KotlinUsesExtractor(
data class TypeResult<LabelType>(val id: Label<LabelType>, val signature: String)
data class TypeResults(val javaResult: TypeResult<out DbType>, val kotlinResult: TypeResult<out DbKt_type>)
fun useTypeOld(t: IrType, canReturnPrimitiveTypes: Boolean = true): Label<out DbType> {
return useType(t, canReturnPrimitiveTypes).javaResult.id
}
fun useType(t: IrType, canReturnPrimitiveTypes: Boolean = true): TypeResults {
when(t) {
is IrSimpleType -> return useSimpleType(t, canReturnPrimitiveTypes)
@@ -587,8 +583,8 @@ class X {
}
fun getFunctionLabel(parent: IrDeclarationParent, name: String, parameters: List<IrValueParameter>, returnType: IrType) : String {
val paramTypeIds = parameters.joinToString() { "{${useTypeOld(erase(it.type)).toString()}}" }
val returnTypeId = useTypeOld(erase(returnType))
val paramTypeIds = parameters.joinToString() { "{${useType(erase(it.type)).javaResult.id.toString()}}" }
val returnTypeId = useType(erase(returnType)).javaResult.id
val parentId = useDeclarationParent(parent)
val label = "@\"callable;{$parentId}.$name($paramTypeIds){$returnTypeId}\""
return label
@@ -613,7 +609,7 @@ class X {
}
is IrTypeProjection -> {
@Suppress("UNCHECKED_CAST")
return useTypeOld(arg.type, false) as Label<out DbReftype>
return useType(arg.type, false).javaResult.id as Label<out DbReftype>
}
else -> {
logger.warn(Severity.ErrorSevere, "Unexpected type argument.")