From 2090b422c05568a822dfbd5b1d863072b583d1b6 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Thu, 5 Jul 2012 08:52:19 +0100 Subject: [PATCH] added compiler scope to the exception thats thrown --- .../jetbrains/jet/lang/resolve/DescriptorResolver.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index c6161e70803..e0068a104ff 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -25,6 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.name.Name; @@ -361,7 +362,12 @@ public class DescriptorResolver { Collections.emptyList(), Visibilities.INTERNAL); if (object != null) { - trace.record(CONSTRUCTOR, object, constructorDescriptor); + try { + trace.record(CONSTRUCTOR, object, constructorDescriptor); + } + catch (RuntimeException e) { + throw new RuntimeException(e.getMessage() + " at " + DiagnosticUtils.atLocation(object), e); + } } return constructorDescriptor; }