File tree Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -30,8 +30,8 @@ sourceSets {
30
30
// change the excludes for building with other versions.
31
31
// Currently 1.7.0 is configured:
32
32
excludes = [
33
- // For 1.7.20-Beta, the below two files should be included, and the corresponding v_1_7_20-Beta ones should be excluded.
34
- // "utils/versions/v_1_4_32/allOverridden .kt",
33
+ // For 1.7.20-Beta, the below two files should be included, and the corresponding v_1_7_20-Beta ones should be excluded from this list .
34
+ // "utils/versions/v_1_4_32/allOverriddenIncludingSelf .kt",
35
35
// "utils/versions/v_1_4_32/createImplicitParameterDeclarationWithWrappedDescriptor.kt",
36
36
" utils/versions/v_1_4_32/Descriptors.kt" ,
37
37
" utils/versions/v_1_4_32/FileEntry.kt" ,
@@ -45,7 +45,7 @@ sourceSets {
45
45
" utils/versions/v_1_6_0/Descriptors.kt" ,
46
46
47
47
" utils/versions/v_1_7_20-Beta/createImplicitParameterDeclarationWithWrappedDescriptor.kt" ,
48
- " utils/versions/v_1_7_20-Beta/allOverridden .kt" ,
48
+ " utils/versions/v_1_7_20-Beta/allOverriddenIncludingSelf .kt" ,
49
49
]
50
50
}
51
51
}
Original file line number Diff line number Diff line change 1
1
package com.github.codeql.utils
2
2
3
- import com.github.codeql.utils.versions.allOverridden
3
+ import com.github.codeql.utils.versions.allOverriddenIncludingSelf
4
4
import org.jetbrains.kotlin.builtins.StandardNames
5
5
import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer
6
6
import org.jetbrains.kotlin.ir.declarations.IrClass
@@ -59,7 +59,7 @@ private val specialFunctionShortNames = specialFunctions.keys.map { it.functionN
59
59
60
60
private fun getSpecialJvmName (f : IrFunction ): String? {
61
61
if (specialFunctionShortNames.contains(f.name) && f is IrSimpleFunction ) {
62
- f.allOverridden( true ).forEach { overriddenFunc ->
62
+ f.allOverriddenIncludingSelf( ).forEach { overriddenFunc ->
63
63
overriddenFunc.parentClassOrNull?.fqNameWhenAvailable?.let { parentFqName ->
64
64
specialFunctions[MethodKey (parentFqName, f.name)]?.let {
65
65
return it
Original file line number Diff line number Diff line change @@ -3,4 +3,4 @@ package com.github.codeql.utils.versions
3
3
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
4
4
import org.jetbrains.kotlin.backend.common.ir.allOverridden
5
5
6
- fun IrSimpleFunction.allOverridden ( includeSelf : Boolean = false ) = this .allOverridden(includeSelf)
6
+ fun IrSimpleFunction.allOverriddenIncludingSelf ( ) = this .allOverridden(includeSelf = true )
Original file line number Diff line number Diff line change @@ -3,4 +3,4 @@ package com.github.codeql.utils.versions
3
3
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
4
4
import org.jetbrains.kotlin.ir.util.allOverridden
5
5
6
- fun IrSimpleFunction.allOverridden ( includeSelf : Boolean = false ) = this .allOverridden(includeSelf)
6
+ fun IrSimpleFunction.allOverriddenIncludingSelf ( ) = this .allOverridden(includeSelf = true )
You can’t perform that action at this time.
0 commit comments