Minor. Move unwrapping of FunctionImportedFromObject
It should not affect the semantics, because mapSignatureWithCustomParameters can only be called with FunctionImportedFromObject from mapSignature. At the same time it's very nice to have all of these kinds of custom unwrapping in the same place
This commit is contained in:
@@ -1034,6 +1034,10 @@ public class KotlinTypeMapper {
|
|||||||
return mapSignature(((TypeAliasConstructorDescriptor) f).getUnderlyingConstructorDescriptor(), kind, skipGenericSignature);
|
return mapSignature(((TypeAliasConstructorDescriptor) f).getUnderlyingConstructorDescriptor(), kind, skipGenericSignature);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (f instanceof FunctionImportedFromObject) {
|
||||||
|
return mapSignature(((FunctionImportedFromObject) f).getCallableFromObject(), kind, skipGenericSignature);
|
||||||
|
}
|
||||||
|
|
||||||
if (CoroutineCodegenUtilKt.isSuspendFunctionNotSuspensionView(f)) {
|
if (CoroutineCodegenUtilKt.isSuspendFunctionNotSuspensionView(f)) {
|
||||||
return mapSignature(CoroutineCodegenUtilKt.getOrCreateJvmSuspendFunctionView(f), kind, skipGenericSignature);
|
return mapSignature(CoroutineCodegenUtilKt.getOrCreateJvmSuspendFunctionView(f), kind, skipGenericSignature);
|
||||||
}
|
}
|
||||||
@@ -1052,10 +1056,6 @@ public class KotlinTypeMapper {
|
|||||||
@NotNull List<ValueParameterDescriptor> valueParameters,
|
@NotNull List<ValueParameterDescriptor> valueParameters,
|
||||||
boolean skipGenericSignature
|
boolean skipGenericSignature
|
||||||
) {
|
) {
|
||||||
if (f instanceof FunctionImportedFromObject) {
|
|
||||||
return mapSignature(((FunctionImportedFromObject) f).getCallableFromObject(), kind, skipGenericSignature);
|
|
||||||
}
|
|
||||||
|
|
||||||
checkOwnerCompatibility(f);
|
checkOwnerCompatibility(f);
|
||||||
|
|
||||||
JvmSignatureWriter sw = skipGenericSignature || f instanceof AccessorForCallableDescriptor
|
JvmSignatureWriter sw = skipGenericSignature || f instanceof AccessorForCallableDescriptor
|
||||||
|
|||||||
Reference in New Issue
Block a user