diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java
index 5e8a015760c..1f305654539 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java
@@ -280,22 +280,23 @@ public abstract class FileBasedKotlinClass implements KotlinJvmBinaryClass {
         return resolveNameByInternalName(name, innerClasses);
     }
 
+    // See ReflectKotlinStructure.classLiteralValue
     @NotNull
     private static ClassLiteralValue resolveKotlinNameByType(@NotNull Type type, @NotNull InnerClassesInfo innerClasses) {
         String typeDesc = type.getDescriptor();
-        int nestedness = typeDesc.charAt(0) == '[' ? type.getDimensions() : 0;
-        String elementDesc = nestedness == 0 ? typeDesc : type.getElementType().getDescriptor();
+        int dimensions = typeDesc.charAt(0) == '[' ? type.getDimensions() : 0;
+        String elementDesc = dimensions == 0 ? typeDesc : type.getElementType().getDescriptor();
         JvmPrimitiveType primType = JvmPrimitiveType.getByDesc(elementDesc);
         if (primType != null) {
-            if (nestedness > 0) {
+            if (dimensions > 0) {
                 // "int[][]" should be loaded as "Array<IntArray>", not as "Array<Array<Int>>"
-                return new ClassLiteralValue(ClassId.topLevel(primType.getPrimitiveType().getArrayTypeFqName()), nestedness - 1);
+                return new ClassLiteralValue(ClassId.topLevel(primType.getPrimitiveType().getArrayTypeFqName()), dimensions - 1);
             }
-            return new ClassLiteralValue(ClassId.topLevel(primType.getPrimitiveType().getTypeFqName()), nestedness);
+            return new ClassLiteralValue(ClassId.topLevel(primType.getPrimitiveType().getTypeFqName()), dimensions);
         }
         ClassId javaClassId = resolveNameByDesc(elementDesc, innerClasses);
         ClassId kotlinClassId = JavaToKotlinClassMap.INSTANCE.mapJavaToKotlin(javaClassId.asSingleFqName());
-        return new ClassLiteralValue(kotlinClassId != null ? kotlinClassId : javaClassId, nestedness);
+        return new ClassLiteralValue(kotlinClassId != null ? kotlinClassId : javaClassId, dimensions);
     }
 
     @NotNull
diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClass.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClass.kt
index b32374c3fe9..01a0dd862d9 100644
--- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClass.kt
+++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClass.kt
@@ -16,6 +16,7 @@
 
 package kotlin.reflect.jvm.internal.components
 
+import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
 import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
 import org.jetbrains.kotlin.load.kotlin.header.ReadKotlinClassHeaderAnnotationVisitor
@@ -185,17 +186,25 @@ private object ReflectClassStructure {
         visitor.visitEnd()
     }
 
+    // See FileBasedKotlinClass.resolveKotlinNameByType
     private fun Class<*>.classLiteralValue(): ClassLiteralValue {
         var currentClass = this
-        var nestedness = 0
+        var dimensions = 0
         while (currentClass.isArray) {
-            nestedness++
+            dimensions++
             currentClass = currentClass.componentType
         }
-        val classId =
-            if (!currentClass.isPrimitive) currentClass.classId
-            else ClassId.topLevel(JvmPrimitiveType.get(currentClass.name).primitiveType.typeFqName)
-        return ClassLiteralValue(classId, nestedness)
+        if (currentClass.isPrimitive) {
+            val primitiveType = JvmPrimitiveType.get(currentClass.name).primitiveType
+            if (dimensions > 0) {
+                return ClassLiteralValue(ClassId.topLevel(primitiveType.arrayTypeFqName), dimensions - 1)
+            }
+            return ClassLiteralValue(ClassId.topLevel(primitiveType.typeFqName), dimensions)
+        }
+
+        val javaClassId = currentClass.classId
+        val kotlinClassId = JavaToKotlinClassMap.mapJavaToKotlin(javaClassId.asSingleFqName()) ?: javaClassId
+        return ClassLiteralValue(kotlinClassId, dimensions)
     }
 
     private fun processAnnotationArgumentValue(visitor: KotlinJvmBinaryClass.AnnotationArgumentVisitor, name: Name, value: Any) {