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

Treat extension receiver as noinline parameter

Browse Source 
#KT-9574 Fixed
This commit is contained in:
Denis Zharkov
2016-01-28 19:03:11 +03:00
parent 2cd88b8cbc
commit 505dc61611
20 changed files with 66 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java
-8
View File
@@ -63,14 +63,6 @@ class InlineChecker implements CallChecker {
inlinableParameters.add(param);
}
}
//add extension receiver as inlinable
ReceiverParameterDescriptor receiverParameter = descriptor.getExtensionReceiverParameter();
if (receiverParameter != null) {
if (isInlinableParameter(receiverParameter)) {
inlinableParameters.add(receiverParameter);
}
}
}
@Override
compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.java
-6
View File
@@ -117,12 +117,6 @@ public class InlineAnalyzerExtension implements FunctionAnalyzerExtension.Analyz
for (ValueParameterDescriptor parameter : parameters) {
hasInlinable |= checkInlinableParameter(parameter, function.getValueParameters().get(index++), functionDescriptor, trace);
}
ReceiverParameterDescriptor receiverParameter = functionDescriptor.getExtensionReceiverParameter();
if (receiverParameter != null) {
KtTypeReference receiver = function.getReceiverTypeReference();
assert receiver != null : "Descriptor has a receiver but psi doesn't " + function.getText();
hasInlinable |= checkInlinableParameter(receiverParameter, receiver, functionDescriptor, trace);
}
hasInlinable |= InlineUtil.containsReifiedTypeParameters(functionDescriptor);