hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 04:36:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't add name mangling to top-level internal functions

Browse Source 
Turns out kotlinc only adds this sort of name mangling to class member functions
This commit is contained in:
Chris Smowton
2022-12-02 17:38:16 +00:00
parent edfcc0cd6d
commit ff4baf096f
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
View File

@@ -821,7 +821,7 @@ open class KotlinUsesExtractor(
OperatorNameConventions.INVOKE.asString()) OperatorNameConventions.INVOKE.asString())
fun getSuffixIfInternal() = fun getSuffixIfInternal() =
if (f.visibility == DescriptorVisibilities.INTERNAL && f !is IrConstructor) { if (f.visibility == DescriptorVisibilities.INTERNAL && f !is IrConstructor && !(f.parent is IrFile || isExternalFileClassMember(f))) {
"\$" + getJvmModuleName(f) "\$" + getJvmModuleName(f)
} else { } else {
"" ""

1
java/ql/test/kotlin/library-tests/java_and_kotlin_internal/Java.java
View File

@@ -1,5 +1,6 @@
public class Java { public class Java {
void javaFun() { void javaFun() {
new Kotlin().kotlinFun$main(); new Kotlin().kotlinFun$main();
KotlinKt.topLevelKotlinFun();
} }
} }

1
java/ql/test/kotlin/library-tests/java_and_kotlin_internal/Kotlin.kt
View File

@@ -3,3 +3,4 @@ public class Kotlin {
} }
} }
internal fun topLevelKotlinFun() { }

7
java/ql/test/kotlin/library-tests/java_and_kotlin_internal/visibility.expected
View File

@@ -1,9 +1,16 @@
isPublic isPublic
isInternal isInternal
| Kotlin.kt:2:11:3:2 | kotlinFun$main | | Kotlin.kt:2:11:3:2 | kotlinFun$main |
| Kotlin.kt:6:10:6:36 | topLevelKotlinFun |
modifiers_methods modifiers_methods
| file://:0:0:0:0 | final | Kotlin.kt:2:11:3:2 | kotlinFun$main | | file://:0:0:0:0 | final | Kotlin.kt:2:11:3:2 | kotlinFun$main |
| file://:0:0:0:0 | final | Kotlin.kt:6:10:6:36 | topLevelKotlinFun |
| file://:0:0:0:0 | internal | Kotlin.kt:2:11:3:2 | kotlinFun$main | | file://:0:0:0:0 | internal | Kotlin.kt:2:11:3:2 | kotlinFun$main |
| file://:0:0:0:0 | internal | Kotlin.kt:6:10:6:36 | topLevelKotlinFun |
| file://:0:0:0:0 | static | Kotlin.kt:6:10:6:36 | topLevelKotlinFun |
#select #select
| Kotlin.kt:2:11:3:2 | kotlinFun$main | final | | Kotlin.kt:2:11:3:2 | kotlinFun$main | final |
| Kotlin.kt:2:11:3:2 | kotlinFun$main | internal | | Kotlin.kt:2:11:3:2 | kotlinFun$main | internal |
| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | final |
| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | internal |
| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | static |