From 3b2bb2ba9fbcf3fc9066585edb5aa0db326b69ea Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Thu, 10 Jun 2021 11:41:09 +0200
Subject: [PATCH] IR: Fix error rendering on IR symbol binding conflict

it could be called with uninitialized `owner` parameter, leading
to the NPE on render
---
 .../org/jetbrains/kotlin/ir/symbols/impl/IrPrivateSymbolBase.kt | 2 +-
 .../org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt  | 2 +-
 2 files changed, 2 insertions(+), 2 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 b1b64619d71..46c47a11e84 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
@@ -61,7 +61,7 @@ abstract class IrBindableSymbolBase<out D : DeclarationDescriptor, B : IrSymbolO
         if (_owner == null) {
             _owner = owner
         } else {
-            throw IllegalStateException("${javaClass.simpleName} is already bound: ${owner.render()}")
+            throw IllegalStateException("${javaClass.simpleName} is already bound: ${_owner?.render()}")
         }
     }
 
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 ef45f4a1598..35a8ad9534b 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
@@ -55,7 +55,7 @@ abstract class IrBindablePublicSymbolBase<out D : DeclarationDescriptor, B : IrS
         if (_owner == null) {
             _owner = owner
         } else {
-            throw IllegalStateException("${javaClass.simpleName} for $signature is already bound: ${owner.render()}")
+            throw IllegalStateException("${javaClass.simpleName} for $signature is already bound: ${_owner?.render()}")
         }
     }