Forbid spread operator in signature-polymorphic calls

#KT-35226 Fixed
This commit is contained in:
Alexander Udalov
2020-01-08 18:37:39 +01:00
parent b6feec4115
commit 5321a6af33
17 changed files with 177 additions and 11 deletions
@@ -0,0 +1,38 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.resolve.jvm.checkers
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker
import org.jetbrains.kotlin.resolve.calls.checkers.CallCheckerContext
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument
import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
object PolymorphicSignatureCallChecker : CallChecker {
@JvmField
val polymorphicSignatureFqName = FqName("java.lang.invoke.MethodHandle.PolymorphicSignature")
override fun check(resolvedCall: ResolvedCall<*>, reportOn: PsiElement, context: CallCheckerContext) {
if (!context.languageVersionSettings.supportsFeature(LanguageFeature.PolymorphicSignature)) return
if (!resolvedCall.resultingDescriptor.annotations.hasAnnotation(polymorphicSignatureFqName)) return
for (valueArgument in resolvedCall.valueArgumentsByIndex ?: return) {
if (valueArgument !is VarargValueArgument) continue
for (argument in valueArgument.arguments) {
val spread = argument.getSpreadElement() ?: continue
val diagnostic =
if (context.languageVersionSettings.supportsFeature(LanguageFeature.ProhibitSpreadOnSignaturePolymorphicCall))
ErrorsJvm.SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL_ERROR
else
ErrorsJvm.SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL
context.trace.report(diagnostic.on(spread))
}
}
}
}
@@ -152,6 +152,10 @@ public class DefaultErrorMessagesJvm implements DefaultErrorMessages.Extension {
MAP.put(CONCURRENT_HASH_MAP_CONTAINS_OPERATOR, MESSAGE_FOR_CONCURRENT_HASH_MAP_CONTAINS);
MAP.put(CONCURRENT_HASH_MAP_CONTAINS_OPERATOR_ERROR, MESSAGE_FOR_CONCURRENT_HASH_MAP_CONTAINS);
MAP.put(TAILREC_WITH_DEFAULTS, "Computation order of non-constant default arguments in tail-recursive functions will change in 1.4. See KT-31540 for more details");
String spreadOnPolymorphicSignature = "Spread operator is prohibited for arguments to signature-polymorphic calls";
MAP.put(SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL, spreadOnPolymorphicSignature);
MAP.put(SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL_ERROR, spreadOnPolymorphicSignature);
}
@NotNull
@@ -134,6 +134,9 @@ public interface ErrorsJvm {
DiagnosticFactory0<KtNamedFunction> TAILREC_WITH_DEFAULTS = DiagnosticFactory0.create(WARNING, DECLARATION_SIGNATURE);
DiagnosticFactory0<PsiElement> SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL = DiagnosticFactory0.create(WARNING);
DiagnosticFactory0<PsiElement> SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL_ERROR = DiagnosticFactory0.create(ERROR);
@SuppressWarnings("UnusedDeclaration")
Object _initializer = new Object() {
{
@@ -53,7 +53,8 @@ object JvmPlatformConfigurator : PlatformConfiguratorBase(
ProtectedSyntheticExtensionCallChecker,
RuntimeAssertionsOnExtensionReceiverCallChecker,
ApiVersionIsAtLeastArgumentsChecker,
InconsistentOperatorFromJavaCallChecker
InconsistentOperatorFromJavaCallChecker,
PolymorphicSignatureCallChecker
),
additionalTypeCheckers = listOf(