From 6e4131de8ee3e33b16afe0a8a17a5546855989ed Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Mon, 24 Jan 2022 13:47:08 +0100
Subject: [PATCH] IR: improve toString for symbols

---
 .../jetbrains/kotlin/ir/symbols/impl/IrPrivateSymbolBase.kt  | 3 ++-
 .../jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt   | 2 +-
 .../ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt  | 5 +----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPrivateSymbolBase.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPrivateSymbolBase.kt
index cc6565c78c3..2a5642c3f28 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPrivateSymbolBase.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPrivateSymbolBase.kt
@@ -29,7 +29,8 @@ abstract class IrSymbolBase<out D : DeclarationDescriptor>(
 
     override fun toString(): String {
         if (isBound) return owner.render()
-        return "Unbound private symbol ${super.toString()}"
+        return "Unbound private symbol " +
+                if (_descriptor != null) "${this::class.java.simpleName}: $_descriptor" else super.toString()
     }
 }
 
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt
index 2e7cbd45c44..c5e92c598f8 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt
@@ -28,7 +28,7 @@ abstract class IrPublicSymbolBase<out D : DeclarationDescriptor> @OptIn(Obsolete
 
     override fun toString(): String {
         if (isBound) return owner.render()
-        return "Unbound public symbol for $signature"
+        return "Unbound public symbol ${this::class.java.simpleName}: $signature"
     }
 }
 
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 5939f7837e6..08e74e55bd7 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
@@ -1128,9 +1128,6 @@ val SymbolTable.allUnbound: Set<IrSymbol>
 fun SymbolTable.noUnboundLeft(message: String) {
     val unbound = this.allUnbound
     assert(unbound.isEmpty()) {
-        "$message\n" +
-                unbound.joinToString("\n") {
-                    "${it::class.simpleName} $it ${it.signature?.toString() ?: "(NON-PUBLIC API)"}: ${it.descriptor}"
-                }
+        message + "\n" + unbound.joinToString("\n")
     }
 }