hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-22 19:56:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply code review changes

Browse Source
This commit is contained in:
Tamas Vajk
2022-08-18 09:01:10 +02:00
parent 5d01653371
commit fb9a34851a
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/kotlin-extractor/build.gradle
View File

@@ -30,8 +30,8 @@ sourceSets {
// change the excludes for building with other versions. // change the excludes for building with other versions.
// Currently 1.7.0 is configured: // Currently 1.7.0 is configured:
excludes = [ excludes = [
// For 1.7.20-Beta, the below two files should be included, and the corresponding v_1_7_20-Beta ones should be excluded. // 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.
//"utils/versions/v_1_4_32/allOverridden.kt", //"utils/versions/v_1_4_32/allOverriddenIncludingSelf.kt",
//"utils/versions/v_1_4_32/createImplicitParameterDeclarationWithWrappedDescriptor.kt", //"utils/versions/v_1_4_32/createImplicitParameterDeclarationWithWrappedDescriptor.kt",
"utils/versions/v_1_4_32/Descriptors.kt", "utils/versions/v_1_4_32/Descriptors.kt",
"utils/versions/v_1_4_32/FileEntry.kt", "utils/versions/v_1_4_32/FileEntry.kt",
@@ -45,7 +45,7 @@ sourceSets {
"utils/versions/v_1_6_0/Descriptors.kt", "utils/versions/v_1_6_0/Descriptors.kt",
"utils/versions/v_1_7_20-Beta/createImplicitParameterDeclarationWithWrappedDescriptor.kt", "utils/versions/v_1_7_20-Beta/createImplicitParameterDeclarationWithWrappedDescriptor.kt",
"utils/versions/v_1_7_20-Beta/allOverridden.kt", "utils/versions/v_1_7_20-Beta/allOverriddenIncludingSelf.kt",
] ]
} }
} }

4
java/kotlin-extractor/src/main/kotlin/utils/JvmNames.kt
View File

@@ -1,6 +1,6 @@
package com.github.codeql.utils package com.github.codeql.utils
import com.github.codeql.utils.versions.allOverridden import com.github.codeql.utils.versions.allOverriddenIncludingSelf
import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer
import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrClass
@@ -59,7 +59,7 @@ private val specialFunctionShortNames = specialFunctions.keys.map { it.functionN
private fun getSpecialJvmName(f: IrFunction): String? { private fun getSpecialJvmName(f: IrFunction): String? {
if (specialFunctionShortNames.contains(f.name) && f is IrSimpleFunction) { if (specialFunctionShortNames.contains(f.name) && f is IrSimpleFunction) {
f.allOverridden(true).forEach { overriddenFunc -> f.allOverriddenIncludingSelf().forEach { overriddenFunc ->
overriddenFunc.parentClassOrNull?.fqNameWhenAvailable?.let { parentFqName -> overriddenFunc.parentClassOrNull?.fqNameWhenAvailable?.let { parentFqName ->
specialFunctions[MethodKey(parentFqName, f.name)]?.let { specialFunctions[MethodKey(parentFqName, f.name)]?.let {
return it return it

2
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/allOverridden.kt → java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/allOverriddenIncludingSelf.kt
View File

@@ -3,4 +3,4 @@ package com.github.codeql.utils.versions
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
import org.jetbrains.kotlin.backend.common.ir.allOverridden import org.jetbrains.kotlin.backend.common.ir.allOverridden
fun IrSimpleFunction.allOverridden(includeSelf: Boolean = false) = this.allOverridden(includeSelf) fun IrSimpleFunction.allOverriddenIncludingSelf() = this.allOverridden(includeSelf = true)

2
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_7_20-Beta/allOverridden.kt → java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_7_20-Beta/allOverriddenIncludingSelf.kt
View File

@@ -3,4 +3,4 @@ package com.github.codeql.utils.versions
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
import org.jetbrains.kotlin.ir.util.allOverridden import org.jetbrains.kotlin.ir.util.allOverridden
fun IrSimpleFunction.allOverridden(includeSelf: Boolean = false) = this.allOverridden(includeSelf) fun IrSimpleFunction.allOverriddenIncludingSelf() = this.allOverridden(includeSelf = true)