Skip to content

Commit 46446f9

Browse files
committed
Kotlin: Move the isLocalFunction check deeper into useFunction
1 parent d0e521e commit 46446f9

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,15 +1201,14 @@ open class KotlinUsesExtractor(
12011201
} as IrFunction? ?: f
12021202

12031203
fun <T: DbCallable> useFunction(f: IrFunction, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>? = null, noReplace: Boolean = false): Label<out T> {
1204+
return useFunction(f, null, classTypeArgsIncludingOuterClasses, noReplace)
1205+
}
1206+
1207+
fun <T: DbCallable> useFunction(f: IrFunction, parentId: Label<out DbElement>?, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?, noReplace: Boolean = false): Label<out T> {
12041208
if (f.isLocalFunction()) {
12051209
val ids = getLocallyVisibleFunctionLabels(f)
12061210
return ids.function.cast<T>()
1207-
} else {
1208-
return useFunction(f, null, classTypeArgsIncludingOuterClasses, noReplace)
12091211
}
1210-
}
1211-
1212-
fun <T: DbCallable> useFunction(f: IrFunction, parentId: Label<out DbElement>?, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?, noReplace: Boolean = false): Label<out T> {
12131212
val javaFun = kotlinFunctionToJavaEquivalent(f, noReplace)
12141213
val label = getFunctionLabel(javaFun, parentId, classTypeArgsIncludingOuterClasses)
12151214
val id: Label<T> = tw.getLabelFor(label)

0 commit comments

Comments
 (0)