Fix: use void as constructor return types in their labels

smowton · igfoo · commit ab449e0517d8 · 2022-05-10T19:51:12.000+01:00
Without this we're incompatible with the Java extractor's constructor labelling
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -546,7 +546,8 @@ class X {
                             params
                         }
         val paramTypeIds = allParams.joinToString { "{${useType(erase(it.type)).javaResult.id}}" }
-        val returnTypeId = useType(erase(returnType)).javaResult.id
+        val labelReturnType = if (name == "<init>") pluginContext.irBuiltIns.unitType else erase(returnType)
+        val returnTypeId = useType(labelReturnType, TypeContext.RETURN).javaResult.id
         return "@\"callable;{$parentId}.$name($paramTypeIds){$returnTypeId}\""
     }
 

Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,8 @@ class X {`
`546`	`546`	`params`
`547`	`547`	`}`
`548`	`548`	`val paramTypeIds = allParams.joinToString { "{${useType(erase(it.type)).javaResult.id}}" }`
`549`		`- val returnTypeId = useType(erase(returnType)).javaResult.id`
	`549`	`+ val labelReturnType = if (name == "<init>") pluginContext.irBuiltIns.unitType else erase(returnType)`
	`550`	`+ val returnTypeId = useType(labelReturnType, TypeContext.RETURN).javaResult.id`
`550`	`551`	`return "@\"callable;{$parentId}.$name($paramTypeIds){$returnTypeId}\""`
`551`	`552`	`}`
`552`	`553`