From 90e6d5bea7bc79534e73f7236e5cf8a7a3e67a2d Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Tue, 19 May 2020 18:40:00 +0300
Subject: [PATCH] [FIR2IR] Read modality directly from IrFunction without using
 descriptor

---
 .../org/jetbrains/kotlin/fir/backend/ConversionUtils.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
index 04f9e4a8168..63c96d5458b 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
@@ -319,8 +319,8 @@ private fun IrClass.findMatchingOverriddenSymbolsFromThisAndSupertypes(
             continue
         }
         when {
-            declaration is IrFunction && target is IrFunction ->
-                if (declaration.descriptor.modality != Modality.FINAL &&
+            declaration is IrSimpleFunction && target is IrSimpleFunction ->
+                if (declaration.modality != Modality.FINAL &&
                     !Visibilities.isPrivate(declaration.visibility) &&
                     isOverriding(irBuiltIns, target, declaration)
                 ) {
@@ -339,7 +339,7 @@ private fun IrClass.findMatchingOverriddenSymbolsFromThisAndSupertypes(
                 if (targetIsPropertyAccessor) {
                     val getter = declaration.getter
                     if (getter != null) {
-                        if (getter.descriptor.modality != Modality.FINAL &&
+                        if (getter.modality != Modality.FINAL &&
                             !Visibilities.isPrivate(getter.visibility) &&
                             isOverriding(irBuiltIns, target, getter)
                         ) {
@@ -348,7 +348,7 @@ private fun IrClass.findMatchingOverriddenSymbolsFromThisAndSupertypes(
                     }
                     val setter = declaration.setter
                     if (setter != null) {
-                        if (setter.descriptor.modality != Modality.FINAL &&
+                        if (setter.modality != Modality.FINAL &&
                             !Visibilities.isPrivate(setter.visibility) &&
                             isOverriding(irBuiltIns, target, setter)
                         ) {