Skip to content

Commit 8761ef6

Browse files
committed
Minor. Rename mapSignature overload to mapSignatureWithCustomParameters
1 parent 7173e56 commit 8761ef6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class DefaultParameterValueSubstitutor(val state: GenerationState) {
135135
(if (isStatic) Opcodes.ACC_STATIC else 0) or
136136
(if (functionDescriptor.modality == Modality.FINAL && functionDescriptor !is ConstructorDescriptor) Opcodes.ACC_FINAL else 0) or
137137
(if (remainingParameters.lastOrNull()?.varargElementType != null) Opcodes.ACC_VARARGS else 0)
138-
val signature = typeMapper.mapSignature(functionDescriptor, contextKind, remainingParameters, false)
138+
val signature = typeMapper.mapSignatureWithCustomParameters(functionDescriptor, contextKind, remainingParameters, false)
139139
val mv = classBuilder.newMethod(OtherOrigin(methodElement, functionDescriptor), flags,
140140
signature.asmMethod.name,
141141
signature.asmMethod.descriptor,

compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,14 +1032,14 @@ private JvmMethodGenericSignature mapSignature(@NotNull FunctionDescriptor f, @N
10321032
}
10331033

10341034
if (f instanceof ConstructorDescriptor) {
1035-
return mapSignature(f, kind, f.getOriginal().getValueParameters(), skipGenericSignature);
1035+
return mapSignatureWithCustomParameters(f, kind, f.getOriginal().getValueParameters(), skipGenericSignature);
10361036
}
10371037

1038-
return mapSignature(f, kind, f.getValueParameters(), skipGenericSignature);
1038+
return mapSignatureWithCustomParameters(f, kind, f.getValueParameters(), skipGenericSignature);
10391039
}
10401040

10411041
@NotNull
1042-
public JvmMethodGenericSignature mapSignature(
1042+
public JvmMethodGenericSignature mapSignatureWithCustomParameters(
10431043
@NotNull FunctionDescriptor f,
10441044
@NotNull OwnerKind kind,
10451045
@NotNull List<ValueParameterDescriptor> valueParameters,
@@ -1049,7 +1049,7 @@ public JvmMethodGenericSignature mapSignature(
10491049
return mapSignature(((FunctionImportedFromObject) f).getCallableFromObject(), kind, skipGenericSignature);
10501050
}
10511051
else if (f instanceof TypeAliasConstructorDescriptor) {
1052-
return mapSignature(((TypeAliasConstructorDescriptor) f).getUnderlyingConstructorDescriptor(), kind, valueParameters, skipGenericSignature);
1052+
return mapSignatureWithCustomParameters(((TypeAliasConstructorDescriptor) f).getUnderlyingConstructorDescriptor(), kind, valueParameters, skipGenericSignature);
10531053
}
10541054

10551055
checkOwnerCompatibility(f);

0 commit comments

Comments
 (0)