From c38f19dbd9377d8032fb51d3d9004c30148ec1cf Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Fri, 25 May 2012 15:07:54 +0400 Subject: [PATCH] unconditional assertion, helpful message --- .../org/jetbrains/jet/lang/resolve/OverrideResolver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java index ea20b311dce..4fafee9b93d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -368,7 +368,11 @@ public class OverrideResolver { @NotNull Multimap invisibleOverriddenDescriptors) { JetNamedDeclaration member = (JetNamedDeclaration) BindingContextUtils.descriptorToDeclaration(trace.getBindingContext(), declared); if (member == null) { - assert trace.get(DELEGATED, declared); + Boolean delegated = trace.get(DELEGATED, declared); + if (delegated == null || !delegated) + throw new IllegalStateException( + "decriptor is not resolved to declaration" + + " and it is not delegate: " + declared + ", DELEGATED: " + delegated); return; }