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

FIR Java: fix exception during synthetic property enhancement

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-09-24 17:09:40 +03:00
parent 368de43623
commit ae23adb6f5
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt
+8 -5
View File
@@ -107,9 +107,14 @@ class FirSignatureEnhancement(
} }
is FirSyntheticProperty -> { is FirSyntheticProperty -> {
val accessorSymbol = firElement.symbol val accessorSymbol = firElement.symbol
val enhancedFunctionSymbol = enhanceMethod( val getterDelegate = firElement.getter.delegate
firElement.getter.delegate, accessorSymbol.accessorId, accessorSymbol.accessorId.callableName val enhancedFunctionSymbol = if (getterDelegate is FirJavaMethod) {
) enhanceMethod(
getterDelegate, accessorSymbol.accessorId, accessorSymbol.accessorId.callableName
)
} else {
getterDelegate.symbol
}
return buildSyntheticProperty { return buildSyntheticProperty {
session = this@FirSignatureEnhancement.session session = this@FirSignatureEnhancement.session
this.name = name this.name = name
@@ -324,8 +329,6 @@ class FirSignatureEnhancement(
return signatureParts.type return signatureParts.type
} }
private val overrideBindCache = mutableMapOf<Name, Map<FirCallableSymbol<*>?, List<FirCallableSymbol<*>>>>()
private sealed class TypeInSignature { private sealed class TypeInSignature {
abstract fun getTypeRef(member: FirCallableMemberDeclaration<*>): FirTypeRef abstract fun getTypeRef(member: FirCallableMemberDeclaration<*>): FirTypeRef