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

Do substitution for receivers of old (by passing though OI) callable references properly, with avoiding premature returning from the method

Browse Source
This commit is contained in:
Victor Petukhov
2021-05-21 15:04:44 +03:00
parent 9fd1cbd2e7
commit d5be258291
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java
+8 -8
View File
@@ -213,6 +213,14 @@ public class ResolvedCallImpl<D extends CallableDescriptor> implements MutableRe
}
}
if (dispatchReceiver instanceof ExpressionReceiver) {
dispatchReceiver = dispatchReceiver.replaceType(substitutor.safeSubstitute(dispatchReceiver.getType(), Variance.IN_VARIANCE));
}
if (extensionReceiver instanceof ExtensionReceiver) {
extensionReceiver =
extensionReceiver.replaceType(substitutor.safeSubstitute(extensionReceiver.getType(), Variance.IN_VARIANCE));
}
if (candidateDescriptor.getValueParameters().isEmpty()) return;
List<ValueParameterDescriptor> substitutedParameters = resultingDescriptor.getValueParameters();
@@ -239,14 +247,6 @@ public class ResolvedCallImpl<D extends CallableDescriptor> implements MutableRe
assert substitutedVersion != null : valueParameterDescriptor;
argumentToParameterMap.put(entry.getKey(), argumentMatch.replaceValueParameter(substitutedVersion));
}
if (dispatchReceiver instanceof ExpressionReceiver) {
dispatchReceiver = dispatchReceiver.replaceType(substitutor.safeSubstitute(dispatchReceiver.getType(), Variance.IN_VARIANCE));
}
if (extensionReceiver instanceof ExtensionReceiver) {
extensionReceiver =
extensionReceiver.replaceType(substitutor.safeSubstitute(extensionReceiver.getType(), Variance.IN_VARIANCE));
}
}
@Override