Fix default interface generic extension fun call with inline class type

When we've determined that we are going to invoke an erased inline class
method ('static foo-impl(this, ...)' in inline class), keep track of it
so that the remaining type mapping logic proceeds correctly.

 #KT-26998 Fixed Target versions 1.3.20
This commit is contained in:
Dmitry Petrov
2018-09-20 15:28:54 +03:00
parent 95010de32e
commit 0f898dc6dc
7 changed files with 68 additions and 1 deletions
@@ -862,6 +862,9 @@ public class KotlinTypeMapper {
}
else {
boolean toInlinedErasedClass = currentOwner.isInline() && !isAccessor(functionDescriptor);
if (toInlinedErasedClass) {
functionDescriptor = descriptor;
}
boolean isStaticInvocation = (isStaticDeclaration(functionDescriptor) &&
!(functionDescriptor instanceof ImportedFromObjectCallableDescriptor)) ||
@@ -890,7 +893,7 @@ public class KotlinTypeMapper {
: functionDescriptor.getOriginal();
signature = toInlinedErasedClass
? mapSignatureForInlineErasedClassSkipGeneric(descriptor.getOriginal())
? mapSignatureForInlineErasedClassSkipGeneric(functionToCall)
: mapSignatureSkipGeneric(functionToCall);
returnKotlinType = functionToCall.getReturnType();