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

IR: avoid name clashes between raised local functions.

Browse Source
This commit is contained in:
Georgy Bronnikov
2020-01-16 17:50:57 +03:00
parent 4e0b54e1a6
commit 1c527fc159
8 changed files with 49 additions and 2 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
+7 -2
View File
@@ -207,6 +207,7 @@ class LocalDeclarationsLowering(
val localFunctions: MutableMap<IrFunction, LocalFunctionContext> = LinkedHashMap()
val localClasses: MutableMap<IrClass, LocalClassContext> = LinkedHashMap()
val localClassConstructors: MutableMap<IrConstructor, LocalClassConstructorContext> = LinkedHashMap()
val usedLocalFunctionNames: MutableSet<Name> = mutableSetOf()
val transformedDeclarations = mutableMapOf<IrSymbolOwner, IrDeclaration>()
@@ -530,8 +531,9 @@ class LocalDeclarationsLowering(
private fun suggestLocalName(declaration: IrDeclarationWithName): String {
localFunctions[declaration]?.let {
val baseName = if (declaration.name.isSpecial) "lambda" else declaration.name
if (it.index >= 0)
return "lambda-${it.index}"
return "$baseName-${it.index}"
}
return localNameProvider.localName(declaration)
@@ -827,9 +829,12 @@ class LocalDeclarationsLowering(
localFunctions[declaration] =
LocalFunctionContext(
declaration,
if (declaration.name.isSpecial) (scopeWithIr as ScopeWithCounter).counter++ else -1,
if (declaration.name.isSpecial || declaration.name in usedLocalFunctionNames)
(scopeWithIr as ScopeWithCounter).counter++
else -1,
scopeWithIr.irElement as IrDeclarationContainer
)
usedLocalFunctionNames.add(declaration.name)
}
}