Skip to content

Commit d704795

Browse files
committed
Use versioned all-overrides function
1 parent d700fdd commit d704795

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package com.github.codeql
22

33
import com.github.codeql.comments.CommentExtractor
44
import com.github.codeql.utils.*
5+
import com.github.codeql.utils.versions.allOverriddenIncludingSelf
56
import com.github.codeql.utils.versions.functionN
67
import com.github.codeql.utils.versions.isUnderscoreParameter
78
import com.semmle.extractor.java.OdasaOutput
89
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
9-
import org.jetbrains.kotlin.backend.common.ir.allOverridden
1010
import org.jetbrains.kotlin.backend.common.lower.parents
1111
import org.jetbrains.kotlin.backend.common.pop
1212
import org.jetbrains.kotlin.builtins.functions.BuiltInFunctionArity
@@ -1859,7 +1859,7 @@ open class KotlinFileExtractor(
18591859

18601860
// Default parameter values are inherited by overrides; in this case the call should dispatch against the $default method belonging to the class
18611861
// that specified the default values, which will in turn dynamically dispatch back to the relevant override.
1862-
val overriddenCallTarget = (callTarget as? IrSimpleFunction)?.allOverridden(true)?.firstOrNull {
1862+
val overriddenCallTarget = (callTarget as? IrSimpleFunction)?.allOverriddenIncludingSelf()?.firstOrNull {
18631863
it.overriddenSymbols.isEmpty() && it.valueParameters.any { p -> p.defaultValue != null }
18641864
} ?: callTarget
18651865
if (isExternalDeclaration(overriddenCallTarget)) {

0 commit comments

Comments
 (0)