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

Name non-generic functions for their non-erased parameter types

Browse Source
This commit is contained in:
Chris Smowton
2022-01-13 11:06:32 +00:00
committed by Ian Lynagh
parent f177c2c5ae
commit fd495aa783
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
View File

@@ -628,7 +628,13 @@ class X {
params.addAll(parameters)
params
}
val paramTypeIds = allParams.joinToString(separator = ",") { "{${useType(erase(it.type)).javaResult.id}}" }
val getIdForFunctionLabel = { it: IrValueParameter ->
// Mimic the Java extractor's behaviour: functions with type parameters are named for their erased types;
// those without type parameters are named for the generic type.
val maybeErased = if (functionTypeParameters.isEmpty()) it.type else erase(it.type)
"{${useType(maybeErased).javaResult.id}}"
}
val paramTypeIds = allParams.joinToString(separator = ",", transform = getIdForFunctionLabel)
val labelReturnType = if (name == "<init>") pluginContext.irBuiltIns.unitType else erase(returnType)
val returnTypeId = useType(labelReturnType, TypeContext.RETURN).javaResult.id
// This suffix is added to generic methods (and constructors) to match the Java extractor's behaviour.