[FIR] Make SyntheticPropertySymbol derived from FirAccessorSymbol

This commit is contained in:
Mikhail Glukhikh
2020-02-05 14:38:21 +03:00
parent a7f9e3ab09
commit a569e29091
6 changed files with 12 additions and 15 deletions
@@ -106,12 +106,12 @@ class JavaClassEnhancementScope(
return symbol
}
is FirSyntheticProperty -> {
original as FirAccessorSymbol
val accessorSymbol = firElement.symbol
val enhancedFunctionSymbol = enhanceMethod(
firElement.getter.delegate, original.accessorId, original.accessorId.callableName
firElement.getter.delegate, accessorSymbol.accessorId, accessorSymbol.accessorId.callableName
)
val enhancedProperty = FirSyntheticProperty(
session, name, FirAccessorSymbol(original.callableId, original.accessorId),
session, name, FirAccessorSymbol(accessorSymbol.callableId, accessorSymbol.accessorId),
enhancedFunctionSymbol.fir as FirSimpleFunction
)
return enhancedProperty.symbol
@@ -49,7 +49,7 @@ class JavaClassUseSiteMemberScope(
syntheticPropertyName: Name,
overrideCandidates: MutableSet<FirCallableSymbol<*>>,
isGetter: Boolean
): FirPropertySymbol? {
): FirAccessorSymbol? {
if (functionSymbol !is FirNamedFunctionSymbol) {
return null
}