azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor. Rename mapSignature overload to mapSignatureWithCustomParameters

Browse Source
This commit is contained in:
Denis Zharkov
2017-03-01 15:54:44 +03:00
parent 7173e56393
commit 8761ef6694
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt
+1 -1
View File
@@ -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,
compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java
+4 -4
View File
@@ -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<ValueParameterDescriptor> 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);