Fix return type of <clinit> methods

tamasvajk · smowton · commit 8b1a7c845c7e · 2022-05-12T22:37:06.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -554,7 +554,7 @@ open class KotlinFileExtractor(
                     classTypeArgsIncludingOuterClasses = listOf()
                 )
                 val clinitId = tw.getLabelFor<DbMethod>(clinitLabel)
-                val returnType = useType(pluginContext.irBuiltIns.unitType)
+                val returnType = useType(pluginContext.irBuiltIns.unitType, TypeContext.RETURN)
                 tw.writeMethods(clinitId, "<clinit>", "<clinit>()", returnType.javaResult.id, parentId, clinitId)
                 tw.writeMethodsKotlinType(clinitId, returnType.kotlinResult.id)
 
diff --git a/java/ql/test/kotlin/library-tests/methods/clinit.expected b/java/ql/test/kotlin/library-tests/methods/clinit.expected
@@ -1 +1 @@
-| clinit.kt:0:0:0:0 | <clinit> | file:///usr/local/Cellar/kotlin/1.6.20/libexec/lib/kotlin-stdlib.jar/kotlin/Unit.class:0:0:0:0 | Unit |
+| clinit.kt:0:0:0:0 | <clinit> | file://:0:0:0:0 | void |

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ open class KotlinFileExtractor(`
`554`	`554`	`classTypeArgsIncludingOuterClasses = listOf()`
`555`	`555`	`)`
`556`	`556`	`val clinitId = tw.getLabelFor<DbMethod>(clinitLabel)`
`557`		`- val returnType = useType(pluginContext.irBuiltIns.unitType)`
	`557`	`+ val returnType = useType(pluginContext.irBuiltIns.unitType, TypeContext.RETURN)`
`558`	`558`	`tw.writeMethods(clinitId, "<clinit>", "<clinit>()", returnType.javaResult.id, parentId, clinitId)`
`559`	`559`	`tw.writeMethodsKotlinType(clinitId, returnType.kotlinResult.id)`
`560`	`560`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| clinit.kt:0:0:0:0 \| <clinit> \| file:///usr/local/Cellar/kotlin/1.6.20/libexec/lib/kotlin-stdlib.jar/kotlin/Unit.class:0:0:0:0 \| Unit \|`
	`1`	`+\| clinit.kt:0:0:0:0 \| <clinit> \| file://:0:0:0:0 \| void \|`