Handle star type argument

tamasvajk · igfoo · commit 936c29b70ccc · 2022-05-10T18:46:00.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -342,9 +342,11 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi
     ): Label<out DbReftype> {
         when (arg) {
             is IrStarProjection -> {
-                // todo handle this
-                logger.warnElement(Severity.ErrorSevere, "Star is not yet handled.", reportOn)
-                return fakeLabel()
+                val wildcardLabel = "@\"wildcard;\""
+                val wildcardId: Label<DbWildcard> = tw.getLabelFor(wildcardLabel)
+                tw.writeWildcards(wildcardId, "*", 1)
+                tw.writeHasLocation(wildcardId, tw.getLocation(-1, -1))
+                return wildcardId
             }
             is IrTypeProjection -> {
                 return useType(arg.type) as Label<out DbReftype>
diff --git a/java/ql/test/kotlin/library-tests/generics/DB-CHECK.expected b/java/ql/test/kotlin/library-tests/generics/DB-CHECK.expected
@@ -3,6 +3,11 @@
 		Full ID for 11: @"type;int"
 	Relevant element: parentid=132
 		Full ID for 132: @"class;foo.bar.C1;(11);(11)". The ID may expand to @"class;foo.bar.C1;{@"type;int"};{@"type;int"}"
+[VALUE_NOT_IN_TYPE] predicate typeArgs(@reftype argumentid, int pos, @typeorcallable parentid): Value 11 of field argumentid is not in type @reftype. The value is however in the following types: @primitive. Appears in tuple (11,0,197)
+	Relevant element: argumentid=11
+		Full ID for 11: @"type;int"
+	Relevant element: parentid=197
+		Full ID for 197: @"class;foo.bar.C0;(11)". The ID may expand to @"class;foo.bar.C0;{@"type;int"}"
 [VALUE_NOT_IN_TYPE] predicate typeArgs(@reftype argumentid, int pos, @typeorcallable parentid): Value 11 of field argumentid is not in type @reftype. The value is however in the following types: @primitive. Appears in tuple (11,1,132)
 	Relevant element: argumentid=11
 		Full ID for 11: @"type;int"
@@ -23,8 +28,4 @@
 		Full ID for 13: @"type;string"
 	Relevant element: parentid=157
 		Full ID for 157: @"class;foo.bar.C1;(13);(11)". The ID may expand to @"class;foo.bar.C1;{@"type;string"};{@"type;int"}"
-[VALUE_NOT_IN_TYPE] predicate typeArgs(@reftype argumentid, int pos, @typeorcallable parentid): Value 13 of field argumentid is not in type @reftype. The value is however in the following types: @primitive. Appears in tuple (13,1,146)
-	Relevant element: argumentid=13
-		Full ID for 13: @"type;string"
-	Relevant element: parentid=146
-		Full ID for 146: @"class;foo.bar.C1;(13);(13)". The ID may expand to @"class;foo.bar.C1;{@"type;string"};{@"type;string"}"
+[VALUE_NOT_IN_TYPE] predicate typeArgs(@reftype argumentid, int pos, @typeorcallable parentid): More errors, not displayed. There are 7 values of field argumentid that are not in type @reftype for a relation of size 12
diff --git a/java/ql/test/kotlin/library-tests/generics/generics.expected b/java/ql/test/kotlin/library-tests/generics/generics.expected
@@ -3,6 +3,8 @@ genericType
 | generics.kt:13:1:18:1 | C1 | generics.kt:13:10:13:10 | T | 0 |
 | generics.kt:13:1:18:1 | C1 | generics.kt:13:13:13:13 | W | 1 |
 parameterizedType
+| generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | file://:0:0:0:0 | * |
+| generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | file://:0:0:0:0 | int |
 | generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | generics.kt:7:6:7:6 | S |
 | generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | generics.kt:11:15:11:15 | V |
 | generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | generics.kt:13:13:13:13 | W |
diff --git a/java/ql/test/kotlin/library-tests/generics/generics.kt b/java/ql/test/kotlin/library-tests/generics/generics.kt
@@ -30,4 +30,5 @@ fun m() {
     val x2 = c2.f2(3)
     val c3 = C2()
     c3.f4(5)
+    val c4: C0<*> = C0<Int>()
 }
diff --git a/java/ql/test/kotlin/library-tests/generics/generics.ql b/java/ql/test/kotlin/library-tests/generics/generics.ql
@@ -3,7 +3,8 @@ import java
 query predicate genericType(GenericType t, TypeVariable tv, int i) { t.getTypeParameter(i) = tv }
 
 query predicate parameterizedType(ParameterizedType t, GenericType gt, int i, RefType ta) {
-  t.getGenericType() = gt and t.getTypeArgument(i) = ta
+  t.getGenericType() = gt and
+  t.getTypeArgument(i) = ta
 }
 
 query predicate genericFunction(GenericCallable c, TypeVariable tv, int i) {

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,5 @@ fun m() {`
`30`	`30`	`val x2 = c2.f2(3)`
`31`	`31`	`val c3 = C2()`
`32`	`32`	`c3.f4(5)`
	`33`	`+ val c4: C0<*> = C0<Int>()`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@ import java`
`3`	`3`	`query predicate genericType(GenericType t, TypeVariable tv, int i) { t.getTypeParameter(i) = tv }`
`4`	`4`
`5`	`5`	`query predicate parameterizedType(ParameterizedType t, GenericType gt, int i, RefType ta) {`
`6`		`- t.getGenericType() = gt and t.getTypeArgument(i) = ta`
	`6`	`+ t.getGenericType() = gt and`
	`7`	`+ t.getTypeArgument(i) = ta`
`7`	`8`	`}`
`8`	`9`
`9`	`10`	`query predicate genericFunction(GenericCallable c, TypeVariable tv, int i) {`