From 742d7db953aea5a6281a32c469987db8295eb357 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 19 Aug 2016 16:07:35 +0200 Subject: [PATCH] diagnostics that helped catch KT-13381 --- .../backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index 8dcf43c8496..95dc14f61a3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -38,6 +38,7 @@ import org.jetbrains.kotlin.load.java.JavaVisibilities; import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.protobuf.MessageLite; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.DeprecationUtilKt; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; @@ -244,13 +245,10 @@ public class AsmUtil { if (specialCase != null) { return specialCase; } - return getDefaultVisibilityFlag(descriptor.getVisibility()); - } - - public static int getDefaultVisibilityFlag(@NotNull Visibility visibility) { + Visibility visibility = descriptor.getVisibility(); Integer defaultMapping = visibilityToAccessFlag.get(visibility); if (defaultMapping == null) { - throw new IllegalStateException(visibility + " is not a valid visibility in backend"); + throw new IllegalStateException(visibility + " is not a valid visibility in backend for " + DescriptorRenderer.DEBUG_TEXT.render(descriptor)); } return defaultMapping; }