Fix JVM signature mapping for multi-dimensional arrays

#KT-11314 Fixed
JetBrains · Feb 17, 2017 · 0d8f643 · 0d8f643
1 parent 83d64e8
commit 0d8f643
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 1 deletion.
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/JvmSignatureWriter.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/JvmSignatureWriter.java
@@ -18,6 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.codegen.AsmUtil;
 import org.jetbrains.kotlin.load.kotlin.JvmDescriptorTypeWriter;
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodGenericSignature;
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind;
@@ -57,7 +58,7 @@ public void writeAsmType(@NotNull Type asmType) {
                 return;
             case Type.ARRAY:
                 writeArrayType();
-                writeAsmType(asmType.getElementType());
+                writeAsmType(AsmUtil.correctElementType(asmType));
                 writeArrayEnd();
                 return;
             default:

diff --git a/compiler/testData/codegen/box/arrays/genericArrayInObjectLiteralConstructor.kt b/compiler/testData/codegen/box/arrays/genericArrayInObjectLiteralConstructor.kt
@@ -0,0 +1,14 @@
+// WITH_RUNTIME
+abstract class Table<T>(
+        val content: Array<Array<T>>
+)
+
+fun box(): String {
+    val x = object : Table<String>(
+            Array(1, {
+                x-> Array(1, {y -> "OK"})
+            })
+    ) {}
+
+    return x.content[0][0]
+}
diff --git a/compiler/testData/codegen/light-analysis/arrays/genericArrayInObjectLiteralConstructor.txt b/compiler/testData/codegen/light-analysis/arrays/genericArrayInObjectLiteralConstructor.txt
@@ -0,0 +1,11 @@
+@kotlin.Metadata
+public final class GenericArrayInObjectLiteralConstructorKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}
+
+@kotlin.Metadata
+public abstract class Table {
+    private final @org.jetbrains.annotations.NotNull field content: java.lang.Object[][]
+    public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.Object[][]): void
+    public final @org.jetbrains.annotations.NotNull method getContent(): java.lang.Object[][]
+}
diff --git a/...er/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/...er/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
@@ -377,6 +377,12 @@ public void testForEachShortArray() throws Exception {
             doTest(fileName);
         }
 
+        @TestMetadata("genericArrayInObjectLiteralConstructor.kt")
+        public void testGenericArrayInObjectLiteralConstructor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/genericArrayInObjectLiteralConstructor.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("hashMap.kt")
         public void testHashMap() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/hashMap.kt");

diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
@@ -377,6 +377,12 @@ public void testForEachShortArray() throws Exception {
             doTest(fileName);
         }
 
+        @TestMetadata("genericArrayInObjectLiteralConstructor.kt")
+        public void testGenericArrayInObjectLiteralConstructor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/genericArrayInObjectLiteralConstructor.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("hashMap.kt")
         public void testHashMap() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/hashMap.kt");

diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
@@ -527,6 +527,12 @@ public void testForEachShortArray() throws Exception {
             doTest(fileName);
         }
 
+        @TestMetadata("genericArrayInObjectLiteralConstructor.kt")
+        public void testGenericArrayInObjectLiteralConstructor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/genericArrayInObjectLiteralConstructor.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("hashMap.kt")
         public void testHashMap() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/hashMap.kt");