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

FIR: Do not propagate overriddenSymbol at FirObjectImportedCallableScope

Browse Source
This commit is contained in:
Denis Zharkov
2020-10-30 12:30:47 +03:00
parent 037ba4d973
commit 728c2a808f
1 changed files with 2 additions and 2 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 -2
View File
@@ -29,7 +29,7 @@ class FirObjectImportedCallableScope(
val function = symbol.fir val function = symbol.fir
val syntheticFunction = buildSimpleFunctionCopy(function) { val syntheticFunction = buildSimpleFunctionCopy(function) {
origin = FirDeclarationOrigin.ImportedFromObject origin = FirDeclarationOrigin.ImportedFromObject
this.symbol = FirNamedFunctionSymbol(CallableId(importedClassId, name), overriddenSymbol = symbol) this.symbol = FirNamedFunctionSymbol(CallableId(importedClassId, name))
}.apply { }.apply {
importedFromObjectData = ImportedFromObjectData(importedClassId, function) importedFromObjectData = ImportedFromObjectData(importedClassId, function)
} }
@@ -46,7 +46,7 @@ class FirObjectImportedCallableScope(
val property = symbol.fir val property = symbol.fir
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))
this.delegateFieldSymbol = null this.delegateFieldSymbol = null
}.apply { }.apply {
importedFromObjectData = ImportedFromObjectData(importedClassId, property) importedFromObjectData = ImportedFromObjectData(importedClassId, property)