From 96f0a8e8e5e356791dc4adbedbe69ed9029976d1 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Tue, 7 Jul 2020 22:07:00 +0200
Subject: [PATCH] IR: minor, inline OverridableMember

---
 .../kotlin/ir/declarations/IrDeclaration.kt   |  8 +++--
 .../kotlin/ir/declarations/IrProperty.kt      |  3 +-
 .../ir/declarations/IrSimpleFunction.kt       |  3 +-
 .../kotlin/resolve/OverridableMember.kt       | 35 -------------------
 4 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100644 core/descriptors/src/org/jetbrains/kotlin/resolve/OverridableMember.kt

diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt
index c204045b26a..25b13304e93 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt
@@ -17,14 +17,14 @@
 package org.jetbrains.kotlin.ir.declarations
 
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibility
-import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
+import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.OverridableMember
 
 interface IrSymbolOwner : IrElement {
     val symbol: IrSymbol
@@ -62,4 +62,6 @@ interface IrDeclarationWithName : IrDeclaration {
     val name: Name
 }
 
-interface IrOverridableMember: OverridableMember, IrDeclarationWithVisibility, IrDeclarationWithName, IrSymbolOwner
+interface IrOverridableMember : IrDeclarationWithVisibility, IrDeclarationWithName, IrSymbolOwner {
+    val modality: Modality
+}
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt
index 5ac15a6d858..1a4e021373a 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt
@@ -20,8 +20,7 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
 
-interface IrProperty : IrDeclarationWithName, IrDeclarationWithVisibility, IrOverridableMember, IrSymbolOwner, IrMetadataSourceOwner {
-
+interface IrProperty : IrOverridableMember, IrMetadataSourceOwner {
     @ObsoleteDescriptorBasedAPI
     override val descriptor: PropertyDescriptor
     override val symbol: IrPropertySymbol
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt
index 4c35fb26cbd..8a1159d3b21 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.ir.declarations
 
-import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 
@@ -25,4 +24,4 @@ interface IrSimpleFunction :
 }
 
 val IrFunction.isPropertyAccessor: Boolean
-    get() = this is IrSimpleFunction && correspondingPropertySymbol != null
\ No newline at end of file
+    get() = this is IrSimpleFunction && correspondingPropertySymbol != null
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridableMember.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridableMember.kt
deleted file mode 100644
index 28801c5673f..00000000000
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridableMember.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.resolve
-
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibility
-import org.jetbrains.kotlin.name.Name
-
-interface MemberWithName {
-    val name: Name
-}
-
-interface MemberWithVisibility {
-    val visibility: Visibility
-}
-
-interface MemberWithModality {
-    val modality: Modality
-}
-
-interface OverridableMember: MemberWithVisibility, MemberWithModality, MemberWithName
\ No newline at end of file