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

FIR: Fix fir2symbol inconsistencies for imported properties

Browse Source 
Do not copy delegateFieldSymbol because otherwise the old symbol will be rebound
to the new instance of a property
This commit is contained in:
Denis Zharkov
2020-10-23 17:09:29 +03:00
parent 09b7237ae5
commit b6a312483a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
+2 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.fir.scopes.impl package org.jetbrains.kotlin.fir.scopes.impl
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.builder.buildPropertyCopy import org.jetbrains.kotlin.fir.declarations.builder.buildPropertyCopy
import org.jetbrains.kotlin.fir.declarations.builder.buildSimpleFunctionCopy import org.jetbrains.kotlin.fir.declarations.builder.buildSimpleFunctionCopy
import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope
@@ -47,6 +47,7 @@ class FirObjectImportedCallableScope(
val syntheticFunction = buildPropertyCopy(property) { val syntheticFunction = buildPropertyCopy(property) {
origin = FirDeclarationOrigin.ImportedFromObject origin = FirDeclarationOrigin.ImportedFromObject
this.symbol = FirPropertySymbol(CallableId(importedClassId, name), overriddenSymbol = symbol) this.symbol = FirPropertySymbol(CallableId(importedClassId, name), overriddenSymbol = symbol)
this.delegateFieldSymbol = null
}.apply { }.apply {
importedFromObjectClassId = importedClassId importedFromObjectClassId = importedClassId
} }