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

[IR] Fix for per-file caches support in K/N

Browse Source
This commit is contained in:
Igor Chevdar
2022-04-18 00:32:46 +05:00
committed by Space
parent 228141aeea
commit 7e4f94ed2c
1 changed files with 2 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
+2 -2
View File
@@ -915,7 +915,7 @@ class LocalDeclarationsLowering(
} }
private fun collectLocalDeclarations() { private fun collectLocalDeclarations() {
val enclosingFile by lazy { container.file } val enclosingPackageFragment = container.getPackageFragment()
val enclosingClass = run { val enclosingClass = run {
var currentParent = container as? IrClass ?: container.parent var currentParent = container as? IrClass ?: container.parent
while (currentParent is IrDeclaration && currentParent !is IrClass) { while (currentParent is IrDeclaration && currentParent !is IrClass) {
@@ -956,7 +956,7 @@ class LocalDeclarationsLowering(
val enclosingScope = data.currentClass val enclosingScope = data.currentClass
?: enclosingClass?.scopeWithCounter ?: enclosingClass?.scopeWithCounter
// File is required for K/N because file declarations are not split by classes. // File is required for K/N because file declarations are not split by classes.
?: enclosingFile.scopeWithCounter ?: enclosingPackageFragment.scopeWithCounter
val index = val index =
if (declaration.name.isSpecial || declaration.name in enclosingScope.usedLocalFunctionNames) if (declaration.name.isSpecial || declaration.name in enclosingScope.usedLocalFunctionNames)
enclosingScope.counter++ enclosingScope.counter++