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

[NI] Fix determining type equality in replacing of extension receiver

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-04-19 13:48:07 +03:00
parent 0739d13038
commit f9cc3d9be3
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt
+2 -3
View File
@@ -206,9 +206,8 @@ class ResolvedAtomCompleter(
val valueType = receiver.value.type.unwrap() val valueType = receiver.value.type.unwrap()
val newValueType = resultSubstitutor.substituteKeepAnnotations(valueType) val newValueType = resultSubstitutor.substituteKeepAnnotations(valueType)
val newReceiverValue = receiver.value.replaceType(newValueType) if (valueType !== newValueType) {
val newReceiverValue = receiver.value.replaceType(newValueType)
if (newReceiverValue != receiver.value) {
functionDescriptor.setExtensionReceiverParameter( functionDescriptor.setExtensionReceiverParameter(
ReceiverParameterDescriptorImpl(receiver.containingDeclaration, newReceiverValue, receiver.annotations) ReceiverParameterDescriptorImpl(receiver.containingDeclaration, newReceiverValue, receiver.annotations)
) )
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ExtensionReceiver.java
-3
View File
@@ -54,9 +54,6 @@ public class ExtensionReceiver extends AbstractReceiverValue implements Implicit
@NotNull @NotNull
@Override @Override
public ReceiverValue replaceType(@NotNull KotlinType newType) { public ReceiverValue replaceType(@NotNull KotlinType newType) {
if (NewKotlinTypeChecker.INSTANCE.equalTypes(receiverType, newType)) {
return this;
}
return new ExtensionReceiver(descriptor, newType, getOriginal()); return new ExtensionReceiver(descriptor, newType, getOriginal());
} }