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

Use getClassLabel for Kotlin <-> Java type correspondences

Browse Source 
Without this, the table can be non-functional due to mapping one unqualified Kotlin type onto several qualified Java types
This commit is contained in:
Chris Smowton
2021-10-25 15:55:34 +01:00
committed by Ian Lynagh
parent f5021e8e68
commit 48d5561c95
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,7 +427,7 @@ class X {
val classInstanceResult = useClassInstance(cls, s.arguments)
val javaClassId = classInstanceResult.classLabel
val kotlinQualClassName = cls.fqNameForIrSerialization.asString()
val kotlinQualClassName = getUnquotedClassLabel(cls, s.arguments)
val javaQualClassName = classInstanceResult.javaClass.fqNameForIrSerialization.asString()
val javaSignature = javaQualClassName // TODO: Is this right?
val javaResult = TypeResult(javaClassId, javaSignature)
@@ -548,7 +548,7 @@ class X {
externalClassExtractor.extractLater(c)
}
private fun getClassLabel(c: IrClass, typeArgs: List<IrTypeArgument>): String {
private fun getUnquotedClassLabel(c: IrClass, typeArgs: List<IrTypeArgument>): String {
val pkg = c.packageFqName?.asString() ?: ""
val cls = c.name.asString()
var label: String
@@ -556,11 +556,9 @@ class X {
if (parent is IrClass) {
// todo: fix this. Ugly string concat to handle nested class IDs.
// todo: Can the containing class have type arguments?
val p = getClassLabel(parent, listOf())
label = "${p.substring(0, p.length - 1)}\$$cls"
label = "${getUnquotedClassLabel(parent, listOf())}\$$cls"
} else {
val qualClassName = if (pkg.isEmpty()) cls else "$pkg.$cls"
label = "@\"class;$qualClassName"
label = if (pkg.isEmpty()) cls else "$pkg.$cls"
}
for (arg in typeArgs) {
@@ -568,10 +566,12 @@ class X {
label += ";{$argId}"
}
label += "\""
return label
}
private fun getClassLabel(c: IrClass, typeArgs: List<IrTypeArgument>) =
"@\"class;${getUnquotedClassLabel(c, typeArgs)}\""
private fun getTypeArgumentLabel(
arg: IrTypeArgument,
reportOn: IrElement