Remove redundant ACC_VARARGS on methods generated with @JvmOverloads

#KT-15424 Fixed
2017-02-09 11:20:54 +03:00
parent 1f179a6f01
commit fcb4db0226
5 changed files with 76 additions and 5 deletions
@@ -0,0 +1,48 @@
+// TARGET_BACKEND: JVM
+// WITH_RUNTIME
+// FULL_JDK
+// FILE: test.kt
+
+@JvmOverloads
+fun foo(id: Int, vararg pairs: String = emptyArray()): String {
+    return "$id: ${java.util.Arrays.toString(pairs)}"
+}
+
+@JvmOverloads
+fun foo2(id: Int, s: Int = 56, vararg pairs: String): String {
+    return "$id, $s: ${java.util.Arrays.toString(pairs)}"
+}
+
+fun box(): String {
+    if (A.bar1() != "1: []") return "fail 1"
+    if (A.bar2() != "2: [OK]") return "fail 2"
+    if (A.bar3() != "3, 56: []") return "fail 3"
+    if (A.bar4() != "4, 56: [OK]") return "fail 4"
+    if (A.bar5() != "5, 1491: [OK]") return "fail 5"
+
+    return "OK"
+}
+
+// FILE: A.java
+
+public class A {
+    public static String bar1() {
+        return TestKt.foo(1);
+    }
+
+    public static String bar2() {
+        return TestKt.foo(2, "OK");
+    }
+
+    public static String bar3() {
+        return TestKt.foo2(3);
+    }
+
+    public static String bar4() {
+        return TestKt.foo2(4, "OK");
+    }
+
+    public static String bar5() {
+        return TestKt.foo2(5, 1491, "OK");
+    }
+}
@@ -0,0 +1,10 @@
+@kotlin.Metadata
+public final class TestKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+    public synthetic static method foo$default(p0: int, p1: java.lang.String[], p2: int, p3: java.lang.Object): java.lang.String
+    public final static @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(p0: int): java.lang.String
+    public final static @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String[]): java.lang.String
+    public synthetic static method foo2$default(p0: int, p1: int, p2: java.lang.String[], p3: int, p4: java.lang.Object): java.lang.String
+    public final static @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo2(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String[]): java.lang.String
+    public final static @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo2(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String[]): java.lang.String
+}