Generate proper annotaions on parameters for @jvmoverloads;

Fix for KT-15743: Overloaded Kotlin extensions annotates wrong parameters in java

 #KT-15743 Fixed

Author: Mikhael Bogdanov

compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt

@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.hasDefaultValue
 import org.jetbrains.kotlin.resolve.jvm.AsmTypes
 import org.jetbrains.kotlin.resolve.jvm.annotations.findJvmOverloadsAnnotation
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.OtherOrigin
+import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind
 import org.jetbrains.org.objectweb.asm.Label
 import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.org.objectweb.asm.Type
@@ -146,10 +147,7 @@ class DefaultParameterValueSubstitutor(val state: GenerationState) {
             mv.visitAnnotation(ANNOTATION_TYPE_DESCRIPTOR_FOR_JVMOVERLOADS_GENERATED_METHODS, /* visible = */ false)
         }
 
-        remainingParameters.withIndex().forEach {
-            val annotationCodegen = AnnotationCodegen.forParameter(it.index, mv, memberCodegen, typeMapper)
-            annotationCodegen.genAnnotations(it.value, signature.valueParameters[it.index].asmType)
-        }
+        FunctionCodegen.generateParameterAnnotations(functionDescriptor, mv, signature, remainingParameters, memberCodegen, state)
 
         if (!state.classBuilderMode.generateBodies) {
             FunctionCodegen.generateLocalVariablesForParameters(mv, signature, null, Label(), Label(), remainingParameters, isStatic, typeMapper)

compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java

@@ -330,9 +330,22 @@ public static void generateParameterAnnotations(
             @NotNull JvmMethodSignature jvmSignature,
             @NotNull InnerClassConsumer innerClassConsumer,
             @NotNull GenerationState state
+    ) {
+        generateParameterAnnotations(
+                functionDescriptor, mv, jvmSignature, functionDescriptor.getValueParameters(), innerClassConsumer, state
+        );
+    }
+
+    public static void generateParameterAnnotations(
+            @NotNull FunctionDescriptor functionDescriptor,
+            @NotNull MethodVisitor mv,
+            @NotNull JvmMethodSignature jvmSignature,
+            @NotNull List<ValueParameterDescriptor> valueParameters,
+            @NotNull InnerClassConsumer innerClassConsumer,
+            @NotNull GenerationState state
     ) {
         KotlinTypeMapper typeMapper = state.getTypeMapper();
-        Iterator<ValueParameterDescriptor> iterator = functionDescriptor.getValueParameters().iterator();
+        Iterator<ValueParameterDescriptor> iterator = valueParameters.iterator();
         List<JvmMethodParameterSignature> kotlinParameterTypes = jvmSignature.getValueParameters();
 
         for (int i = 0; i < kotlinParameterTypes.size(); i++) {

compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.kt

@@ -0,0 +1,129 @@
+// WITH_RUNTIME
+
+annotation class StringRes
+annotation class LongRes
+annotation class DefRes
+
+class ASimpleClass {
+    @JvmOverloads
+    fun String.showSnackbar(@StringRes stringResId: Int, duration: Int = 2) {
+
+    }
+
+    @JvmOverloads
+    fun showSnackbarNoExtension(@StringRes stringResId: Int, duration: Int = 2) {
+
+    }
+
+    @JvmOverloads
+    fun String.showSnackbarLong(@StringRes stringResId: Int, @DefRes duration: Int = 2, @LongRes oneMoreNonDefault: Long, andDefaultOne: String = "Default") {
+
+    }
+
+    @JvmOverloads
+    fun showSnackbarLongNoExtension(@StringRes stringResId: Int, @DefRes duration: Int = 2, @LongRes oneMoreNonDefault: Long, andDefaultOne: String = "Default") {
+
+    }
+}
+
+object BSimpleObject {
+    @JvmStatic
+    @JvmOverloads
+    fun String.showSnackbar(@StringRes stringResId: Int, duration: Int = 2) {
+
+    }
+
+    @JvmStatic
+    @JvmOverloads
+    fun showSnackbarNoExtension(@StringRes stringResId: Int, duration: Int = 2) {
+
+    }
+
+    @JvmStatic
+    @JvmOverloads
+    fun String.showSnackbarLong(@StringRes stringResId: Int, @DefRes duration: Int = 2, @LongRes oneMoreNonDefault: Long, andDefaultOne: String = "Default") {
+
+    }
+
+    @JvmStatic
+    @JvmOverloads
+    fun showSnackbarLongNoExtension(@StringRes stringResId: Int, @DefRes duration: Int = 2, @LongRes oneMoreNonDefault: Long, andDefaultOne: String = "Default") {
+
+    }
+}
+
+class CClassWithCompanion {
+    companion object {
+        @JvmStatic
+        @JvmOverloads
+        fun String.showSnackbar(@StringRes stringResId: Int, duration: Int = 2) {
+
+        }
+
+        @JvmStatic
+        @JvmOverloads
+        fun showSnackbarNoExtension(@StringRes stringResId: Int, duration: Int = 2) {
+
+        }
+
+        @JvmStatic
+        @JvmOverloads
+        fun String.showSnackbarLong(@StringRes stringResId: Int, @DefRes duration: Int = 2, @LongRes oneMoreNonDefault: Long, andDefaultOne: String = "Default") {
+
+        }
+
+        @JvmStatic
+        @JvmOverloads
+        fun showSnackbarLongNoExtension(@StringRes stringResId: Int, @DefRes duration: Int = 2, @LongRes oneMoreNonDefault: Long, andDefaultOne: String = "Default") {
+
+        }
+    }
+}
+
+class DClassConstuctors {
+    @JvmOverloads
+    constructor(@StringRes stringResId: Int, duration: Int = 2) {
+
+    }
+
+    @JvmOverloads
+    constructor(@StringRes stringResId: Int, @DefRes duration: Int = 2, @LongRes oneMoreNonDefault: Long, andDefaultOne: String = "Default") {
+
+    }
+
+    inner class InnerClass {
+        @JvmOverloads
+        constructor(@StringRes stringResId: Int, duration: Int = 2) {
+
+        }
+
+        @JvmOverloads
+        constructor(@StringRes stringResId: Int, @DefRes duration: Int = 2, @LongRes oneMoreNonDefault: Long, andDefaultOne: String = "Default") {
+
+        }
+
+    }
+}
+
+
+
+@JvmOverloads
+fun String.showSnackbar(@StringRes stringResId: Int, duration: Int = 2) {
+
+}
+
+@JvmOverloads
+fun showSnackbarNoExtension(@StringRes stringResId: Int, duration: Int = 2) {
+
+}
+
+@JvmOverloads
+fun String.showSnackbarLong(@StringRes stringResId: Int, @DefRes duration: Int = 2, @LongRes oneMoreNonDefault: Long, andDefaultOne: String = "Default") {
+
+}
+
+
+@JvmOverloads
+fun showSnackbarLongNoExtension(@StringRes stringResId: Int, @DefRes duration: Int = 2, @LongRes oneMoreNonDefault: Long, andDefaultOne: String = "Default") {
+
+}