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

Properly extract wildcard bounds

Browse Source
This commit is contained in:
Chris Smowton
2021-11-10 19:01:24 +00:00
committed by Ian Lynagh
parent 356639dadd
commit 06c4fd9060
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -718,14 +718,22 @@ class X {
fun getTypeArgumentLabel(
arg: IrTypeArgument
): Label<out DbReftype> {
when (arg) {
is IrStarProjection -> {
val wildcardLabel = "@\"wildcard;\""
return tw.getLabelFor<DbWildcard>(wildcardLabel) {
tw.writeWildcards(it, "*", 1)
tw.writeHasLocation(it, tw.unknownLocation)
fun extractBoundedWildcard(wildcardKind: Int, wildcardLabelStr: String, boundLabel: Label<out DbReftype>): Label<DbWildcard> =
tw.getLabelFor(wildcardLabelStr) { wildcardLabel ->
tw.writeWildcards(wildcardLabel, typeArgShortName(arg), wildcardKind)
tw.writeHasLocation(wildcardLabel, tw.unknownLocation)
tw.getLabelFor<DbTypebound>("@\"bound;0;{$wildcardLabel}\"") {
tw.writeTypeBounds(it, boundLabel, 0, wildcardLabel)
}
}
return when (arg) {
is IrStarProjection -> {
@Suppress("UNCHECKED_CAST")
val anyTypeLabel = useType(pluginContext.irBuiltIns.anyType).javaResult.id as Label<out DbReftype>
extractBoundedWildcard(1, "@\"wildcard;\"", anyTypeLabel)
}
is IrTypeProjection -> {
@Suppress("UNCHECKED_CAST")
val boundLabel = useType(arg.type, false).javaResult.id as Label<out DbReftype>
@@ -735,10 +743,7 @@ class X {
else {
val keyPrefix = if (arg.variance == Variance.IN_VARIANCE) "super" else "extends"
val wildcardKind = if (arg.variance == Variance.IN_VARIANCE) 2 else 1
tw.getLabelFor<DbWildcard>("@\"wildcard;$keyPrefix{$boundLabel}\"") {
tw.writeWildcards(it, typeArgShortName(arg), wildcardKind)
tw.writeHasLocation(it, tw.unknownLocation)
}
extractBoundedWildcard(wildcardKind, "@\"wildcard;$keyPrefix{$boundLabel}\"", boundLabel)
}
}
else -> {