azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-51883 Don't use "-" in generated unique lifted declaration names

Browse Source
This commit is contained in:
Pavel Mikhailovskii
2022-06-09 09:45:10 +02:00
committed by teamcity
parent fb9c5c13bd
commit ecb3cc193c
29 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt
+2 -2
View File
@@ -70,7 +70,7 @@ class LocalDeclarationsLowering(
val context: CommonBackendContext,
val localNameSanitizer: (String) -> String = { it },
val visibilityPolicy: VisibilityPolicy = VisibilityPolicy.DEFAULT,
val suggestUniqueNames: Boolean = true, // When `true` appends a `-#index` suffix to lifted declaration names
val suggestUniqueNames: Boolean = true, // When `true` appends a `$#index` suffix to lifted declaration names
val forceFieldsForInlineCaptures: Boolean = false, // See `LocalClassContext`
private val postLocalDeclarationLoweringCallback: ((IntermediateDatastructures) -> Unit)? = null
) :
@@ -594,7 +594,7 @@ class LocalDeclarationsLowering(
localFunctions[declaration]?.let {
val baseName = if (declaration.name.isSpecial) "lambda" else declarationName
if (it.index >= 0)
return if (suggestUniqueNames) "$baseName-${it.index}" else baseName
return if (suggestUniqueNames) "$baseName\$${it.index}" else baseName
}
return declarationName