azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

diagnostics that helped catch KT-13381

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-08-19 16:07:35 +02:00
parent 9fd61b869e
commit 742d7db953
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
+3 -5
View File
@@ -38,6 +38,7 @@ import org.jetbrains.kotlin.load.java.JavaVisibilities;
import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.protobuf.MessageLite; import org.jetbrains.kotlin.protobuf.MessageLite;
import org.jetbrains.kotlin.renderer.DescriptorRenderer;
import org.jetbrains.kotlin.resolve.DeprecationUtilKt; import org.jetbrains.kotlin.resolve.DeprecationUtilKt;
import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt;
@@ -244,13 +245,10 @@ public class AsmUtil {
if (specialCase != null) { if (specialCase != null) {
return specialCase; return specialCase;
} }
return getDefaultVisibilityFlag(descriptor.getVisibility()); Visibility visibility = descriptor.getVisibility();
}
public static int getDefaultVisibilityFlag(@NotNull Visibility visibility) {
Integer defaultMapping = visibilityToAccessFlag.get(visibility); Integer defaultMapping = visibilityToAccessFlag.get(visibility);
if (defaultMapping == null) { 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; return defaultMapping;
} }