From efd614194bd37df093c3419fda6ca8ff54ccc1e3 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Wed, 24 Jun 2020 18:17:47 +0300
Subject: [PATCH] [FIR2IR] Make Fir2IrBindableSymbol public API

---
 .../kotlin/fir/symbols/Fir2IrBindableSymbol.kt      |  2 +-
 .../src/org/jetbrains/kotlin/ir/util/SymbolTable.kt | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt
index b7502a28e6f..7285dc7961c 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt
@@ -32,7 +32,7 @@ abstract class Fir2IrBindableSymbol<out D : DeclarationDescriptor, B : IrSymbolO
         }
     }
 
-    override val isPublicApi: Boolean = false
+    override val isPublicApi: Boolean = true
 
     override val isBound: Boolean
         get() = _owner != null
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt
index 122cca0551b..d4453d78221 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt
@@ -1001,6 +1001,7 @@ open class SymbolTable(
                 throw IllegalArgumentException("Unexpected value descriptor: $value")
         }
 
+    @OptIn(ObsoleteDescriptorBasedAPI::class)
     fun wrappedTopLevelCallableDescriptors(): Set<DescriptorWithContainerSource> {
         val result = mutableSetOf<DescriptorWithContainerSource>()
         for (descriptor in simpleFunctionSymbolTable.descriptorToSymbol.keys) {
@@ -1008,11 +1009,23 @@ open class SymbolTable(
                 result.add(descriptor)
             }
         }
+        for (symbol in simpleFunctionSymbolTable.idSigToSymbol.values) {
+            val descriptor = symbol.descriptor
+            if (descriptor is WrappedFunctionDescriptorWithContainerSource && symbol.owner.parent !is IrClass) {
+                result.add(descriptor)
+            }
+        }
         for (descriptor in propertySymbolTable.descriptorToSymbol.keys) {
             if (descriptor is WrappedPropertyDescriptorWithContainerSource && descriptor.owner.parent !is IrClass) {
                 result.add(descriptor)
             }
         }
+        for (symbol in propertySymbolTable.idSigToSymbol.values) {
+            val descriptor = symbol.descriptor
+            if (descriptor is WrappedPropertyDescriptorWithContainerSource && symbol.owner.parent !is IrClass) {
+                result.add(descriptor)
+            }
+        }
         return result
     }