diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt index 673b62ad6d0..bb3ad980850 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt @@ -135,7 +135,7 @@ class DefaultParameterValueSubstitutor(val state: GenerationState) { (if (isStatic) Opcodes.ACC_STATIC else 0) or (if (functionDescriptor.modality == Modality.FINAL && functionDescriptor !is ConstructorDescriptor) Opcodes.ACC_FINAL else 0) or (if (remainingParameters.lastOrNull()?.varargElementType != null) Opcodes.ACC_VARARGS else 0) - val signature = typeMapper.mapSignature(functionDescriptor, contextKind, remainingParameters, false) + val signature = typeMapper.mapSignatureWithCustomParameters(functionDescriptor, contextKind, remainingParameters, false) val mv = classBuilder.newMethod(OtherOrigin(methodElement, functionDescriptor), flags, signature.asmMethod.name, signature.asmMethod.descriptor, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java index ee9a449f7b7..1628f7fcb94 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java @@ -1032,14 +1032,14 @@ public class KotlinTypeMapper { } if (f instanceof ConstructorDescriptor) { - return mapSignature(f, kind, f.getOriginal().getValueParameters(), skipGenericSignature); + return mapSignatureWithCustomParameters(f, kind, f.getOriginal().getValueParameters(), skipGenericSignature); } - return mapSignature(f, kind, f.getValueParameters(), skipGenericSignature); + return mapSignatureWithCustomParameters(f, kind, f.getValueParameters(), skipGenericSignature); } @NotNull - public JvmMethodGenericSignature mapSignature( + public JvmMethodGenericSignature mapSignatureWithCustomParameters( @NotNull FunctionDescriptor f, @NotNull OwnerKind kind, @NotNull List valueParameters, @@ -1049,7 +1049,7 @@ public class KotlinTypeMapper { return mapSignature(((FunctionImportedFromObject) f).getCallableFromObject(), kind, skipGenericSignature); } else if (f instanceof TypeAliasConstructorDescriptor) { - return mapSignature(((TypeAliasConstructorDescriptor) f).getUnderlyingConstructorDescriptor(), kind, valueParameters, skipGenericSignature); + return mapSignatureWithCustomParameters(((TypeAliasConstructorDescriptor) f).getUnderlyingConstructorDescriptor(), kind, valueParameters, skipGenericSignature); } checkOwnerCompatibility(f);