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

[FIR2IR] Read modality directly from IrFunction without using descriptor

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-05-19 18:40:00 +03:00
parent 724101cdd2
commit 90e6d5bea7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+4 -4
View File
@@ -319,8 +319,8 @@ private fun IrClass.findMatchingOverriddenSymbolsFromThisAndSupertypes(
continue continue
} }
when { when {
declaration is IrFunction && target is IrFunction -> declaration is IrSimpleFunction && target is IrSimpleFunction ->
if (declaration.descriptor.modality != Modality.FINAL && if (declaration.modality != Modality.FINAL &&
!Visibilities.isPrivate(declaration.visibility) && !Visibilities.isPrivate(declaration.visibility) &&
isOverriding(irBuiltIns, target, declaration) isOverriding(irBuiltIns, target, declaration)
) { ) {
@@ -339,7 +339,7 @@ private fun IrClass.findMatchingOverriddenSymbolsFromThisAndSupertypes(
if (targetIsPropertyAccessor) { if (targetIsPropertyAccessor) {
val getter = declaration.getter val getter = declaration.getter
if (getter != null) { if (getter != null) {
if (getter.descriptor.modality != Modality.FINAL && if (getter.modality != Modality.FINAL &&
!Visibilities.isPrivate(getter.visibility) && !Visibilities.isPrivate(getter.visibility) &&
isOverriding(irBuiltIns, target, getter) isOverriding(irBuiltIns, target, getter)
) { ) {
@@ -348,7 +348,7 @@ private fun IrClass.findMatchingOverriddenSymbolsFromThisAndSupertypes(
} }
val setter = declaration.setter val setter = declaration.setter
if (setter != null) { if (setter != null) {
if (setter.descriptor.modality != Modality.FINAL && if (setter.modality != Modality.FINAL &&
!Visibilities.isPrivate(setter.visibility) && !Visibilities.isPrivate(setter.visibility) &&
isOverriding(irBuiltIns, target, setter) isOverriding(irBuiltIns, target, setter)
) { ) {