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

Merge pull request #11553 from smowton/smowton/fix/kotlin-synthetic-noarg-constructor

Browse Source 
Kotlin: Extract a no-arg constuctor whenever a Kotlin class has default values for all parameters
This commit is contained in:
Chris Smowton
2022-12-06 10:07:31 +00:00
committed by GitHub
parent f0ac59be25 407e4cdd07
commit 3b5b121aeb
4 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
View File

@@ -1049,8 +1049,6 @@ open class KotlinFileExtractor(
private val jvmOverloadsFqName = FqName("kotlin.jvm.JvmOverloads")
private fun extractGeneratedOverloads(f: IrFunction, parentId: Label<out DbReftype>, maybeSourceParentId: Label<out DbReftype>?, extractBody: Boolean, extractMethodAndParameterTypeAccesses: Boolean, typeSubstitution: TypeSubstitution?, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?) {
if (!f.hasAnnotation(jvmOverloadsFqName))
return
fun extractGeneratedOverload(paramList: List<IrValueParameter?>) {
val overloadParameters = paramList.filterNotNull()
@@ -1096,6 +1094,22 @@ open class KotlinFileExtractor(
}
}
if (!f.hasAnnotation(jvmOverloadsFqName)) {
if (f is IrConstructor &&
f.valueParameters.isNotEmpty() &&
f.valueParameters.all { it.defaultValue != null } &&
f.parentClassOrNull?.let {
// Don't create a default constructor for an annotation class, or a class that explicitly declares a no-arg constructor.
!it.isAnnotationClass &&
it.declarations.none { d -> d is IrConstructor && d.valueParameters.isEmpty() }
} == true) {
// Per https://kotlinlang.org/docs/classes.html#creating-instances-of-classes, a single default overload gets created specifically
// when we have all default parameters, regardless of `@JvmOverloads`.
extractGeneratedOverload(f.valueParameters.map { _ -> null })
}
return
}
val paramList: MutableList<IrValueParameter?> = f.valueParameters.toMutableList()
for (n in (f.valueParameters.size - 1) downTo 0) {
if (f.valueParameters[n].defaultValue != null) {