From 88f55100ca1f15aa9631b696bcd42a40c4af1ce2 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Mon, 12 Mar 2012 22:53:55 +0400 Subject: [PATCH] make sure ClassDescriptor.toString does not crash so we can use it in exception messages --- .../jet/lang/descriptors/MutableClassDescriptorLite.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java index a1c2630546d..e5ee2926c86 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java @@ -330,7 +330,11 @@ public class MutableClassDescriptorLite extends MutableDeclarationDescriptor imp @Override public String toString() { - return DescriptorRenderer.TEXT.render(this) + "[" + getClass().getCanonicalName() + "@" + System.identityHashCode(this) + "]"; + try { + return DescriptorRenderer.TEXT.render(this) + "[" + getClass().getCanonicalName() + "@" + System.identityHashCode(this) + "]"; + } catch (Throwable e) { + return super.toString(); + } } @Override