Extract synthetic coroutine classes

smowton · igfoo · commit bfe372201826 · 2022-05-10T19:51:28.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/ExternalDecls.kt b/java/kotlin-extractor/src/main/kotlin/utils/ExternalDecls.kt
@@ -8,7 +8,8 @@ import org.jetbrains.kotlin.ir.util.parentClassOrNull
 
 fun isExternalDeclaration(d: IrDeclaration): Boolean {
     return d.origin == IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB ||
-           d.origin == IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB
+           d.origin == IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB ||
+           d.origin.toString() == "FUNCTION_INTERFACE_CLASS" // Treat kotlin.coroutines.* like ordinary library classes
 }
 
 /**
diff --git a/java/ql/test/kotlin/library-tests/coroutines/coroutine_user.kt b/java/ql/test/kotlin/library-tests/coroutines/coroutine_user.kt
@@ -0,0 +1,3 @@
+import kotlin.coroutines.SuspendFunction0
+
+fun f(x: SuspendFunction0<String>) {}
diff --git a/java/ql/test/kotlin/library-tests/coroutines/test.ql b/java/ql/test/kotlin/library-tests/coroutines/test.ql
@@ -0,0 +1,5 @@
+import java
+
+from Callable c
+where c.fromSource()
+select c, c.getAParamType().toString()

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ import org.jetbrains.kotlin.ir.util.parentClassOrNull`
`8`	`8`
`9`	`9`	`fun isExternalDeclaration(d: IrDeclaration): Boolean {`
`10`	`10`	`return d.origin == IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB \|\|`
`11`		`- d.origin == IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB`
	`11`	`+ d.origin == IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB \|\|`
	`12`	`+ d.origin.toString() == "FUNCTION_INTERFACE_CLASS" // Treat kotlin.coroutines.* like ordinary library classes`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import kotlin.coroutines.SuspendFunction0`
	`2`	`+`
	`3`	`+fun f(x: SuspendFunction0<String>) {}`