From 94ef40fc51248db4d3d02bf9daad0a60b2395d09 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Sat, 31 Dec 2011 00:53:43 +0400 Subject: [PATCH] safer toString in classes --- .../jet/lang/descriptors/DeclarationDescriptorImpl.java | 2 +- .../jet/lang/descriptors/TypeParameterDescriptor.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java index e3614e3f356..85a5b2e4856 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java @@ -51,7 +51,7 @@ public abstract class DeclarationDescriptorImpl extends AnnotatedImpl implements } catch (Throwable e) { // DescriptionRenderer may throw if this is not yet completely initialized // It is very inconvenient while debugging - return super.toString(); + return this.getClass().getName() + "@" + System.identityHashCode(this); } } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java index bbd1e6899b9..96fec12666b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java @@ -165,7 +165,11 @@ public class TypeParameterDescriptor extends DeclarationDescriptorImpl implement @Override public String toString() { - return DescriptorRenderer.TEXT.render(this); + try { + return DescriptorRenderer.TEXT.render(this); + } catch (Exception e) { + return this.getClass().getName() + "@" + System.identityHashCode(this); + } } @NotNull