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

Forbid spread operator in signature-polymorphic calls

Browse Source 
#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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java
+2 -2
View File
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor;
import org.jetbrains.kotlin.load.java.descriptors.JavaPropertyDescriptor;
import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityUtilsKt;
import org.jetbrains.kotlin.metadata.jvm.deserialization.ModuleMapping;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.BindingContext;
@@ -39,6 +38,7 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import org.jetbrains.kotlin.resolve.inline.InlineUtil;
import org.jetbrains.kotlin.resolve.jvm.checkers.PolymorphicSignatureCallChecker;
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver;
import org.jetbrains.kotlin.resolve.source.PsiSourceElement;
@@ -368,7 +368,7 @@ public class JvmCodegenUtil {
}
public static boolean isPolymorphicSignature(@NotNull FunctionDescriptor descriptor) {
return descriptor.getAnnotations().hasAnnotation(new FqName("java.lang.invoke.MethodHandle.PolymorphicSignature"));
return descriptor.getAnnotations().hasAnnotation(PolymorphicSignatureCallChecker.polymorphicSignatureFqName);
}
@NotNull
compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+23
View File
@@ -13003,6 +13003,29 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
}
}
@TestMetadata("compiler/testData/diagnostics/tests/j+k/polymorphicSignature")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class PolymorphicSignature extends AbstractFirOldFrontendDiagnosticsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInPolymorphicSignature() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/polymorphicSignature"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@TestMetadata("spreadOperator_after.kt")
public void testSpreadOperator_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/j+k/polymorphicSignature/spreadOperator_after.kt");
}
@TestMetadata("spreadOperator_before.kt")
public void testSpreadOperator_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/j+k/polymorphicSignature/spreadOperator_before.kt");
}
}
@TestMetadata("compiler/testData/diagnostics/tests/j+k/primitiveOverrides")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/PolymorphicSignatureCallChecker.kt
+38
View File
@@ -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))
}
}
}
}
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java
+4
View File
@@ -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
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/ErrorsJvm.java
+3
View File
@@ -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() {
{
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt
+2 -1
View File
@@ -53,7 +53,8 @@ object JvmPlatformConfigurator : PlatformConfiguratorBase(
ProtectedSyntheticExtensionCallChecker,
RuntimeAssertionsOnExtensionReceiverCallChecker,
ApiVersionIsAtLeastArgumentsChecker,
InconsistentOperatorFromJavaCallChecker
InconsistentOperatorFromJavaCallChecker,
PolymorphicSignatureCallChecker
),
additionalTypeCheckers = listOf(
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/PolymorphicSignatureLowering.kt
+2 -4
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.ir.types.isNullableAny
import org.jetbrains.kotlin.ir.util.dump
import org.jetbrains.kotlin.ir.util.hasAnnotation
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.resolve.jvm.checkers.PolymorphicSignatureCallChecker
internal val polymorphicSignaturePhase = makeIrFilePhase(
::PolymorphicSignatureLowering,
@@ -30,8 +30,6 @@ internal val polymorphicSignaturePhase = makeIrFilePhase(
description = "Replace polymorphic methods with fake ones according to types at the call site"
)
private val polymorphicSignatureAnnotation = FqName("java.lang.invoke.MethodHandle.PolymorphicSignature")
class PolymorphicSignatureLowering(val context: JvmBackendContext) : IrElementTransformerVoid(), FileLoweringPass {
override fun lower(irFile: IrFile) {
if (context.state.languageVersionSettings.supportsFeature(LanguageFeature.PolymorphicSignature))
@@ -52,7 +50,7 @@ class PolymorphicSignatureLowering(val context: JvmBackendContext) : IrElementTr
private fun IrCall.transform(castReturnType: IrType?): IrCall? {
val function = symbol.owner as? IrSimpleFunction ?: return null
if (!function.hasAnnotation(polymorphicSignatureAnnotation))
if (!function.hasAnnotation(PolymorphicSignatureCallChecker.polymorphicSignatureFqName))
return null
assert(function.valueParameters.singleOrNull()?.varargElementType != null) {
"@PolymorphicSignature methods should only have a single vararg argument: ${dump()}"
compiler/testData/codegen/box/polymorphicSignature/varargOfObjects_after.kt
Vendored
+5 -4
View File
@@ -22,8 +22,9 @@ fun box(): String {
val r1 = mh.invokeExact(args)
if (r1 != "aaa") return "Fail 1: $r1"
val r2 = mh.invokeExact(*args)
if (r2 != "aaa") return "Fail 2: $r2"
// Spread operator is prohibited for arguments to signature-polymorphic calls
// val r2 = mh.invokeExact(*args)
// if (r2 != "aaa") return "Fail 2: $r2"
val r3 = mh.invokeExact(arrayOf(args) as Array<*>)
if (r3 !is Array<*> || !r3.contentEquals(args)) return "Fail 3: $r3"
@@ -38,8 +39,8 @@ fun box(): String {
val r5 = mh.invoke(args)
if (r5 != "aaa") return "Fail 5: $r5"
val r6 = mh.invoke(*args)
if (r6 != "aaa") return "Fail 6: $r6"
// val r6 = mh.invoke(*args)
// if (r6 != "aaa") return "Fail 6: $r6"
val r7 = mh.invoke(arrayOf(args) as Array<*>)
if (r7 !is Array<*> || !r7.contentEquals(args)) return "Fail 7: $r7"
compiler/testData/diagnostics/tests/j+k/polymorphicSignature/spreadOperator_after.fir.kt
Vendored
+11
View File
@@ -0,0 +1,11 @@
// !LANGUAGE: +PolymorphicSignature +ProhibitSpreadOnSignaturePolymorphicCall
// FULL_JDK
import java.lang.invoke.MethodHandle
fun test(mh: MethodHandle) {
mh.invokeExact("1", "2")
mh.invokeExact(*emptyArray(), "X")
mh.invokeExact(*arrayOf("A", "B"), "C", *arrayOf("D", "E"))
mh.invoke(*arrayOf("A"))
}
compiler/testData/diagnostics/tests/j+k/polymorphicSignature/spreadOperator_after.kt
Vendored
+11
View File
@@ -0,0 +1,11 @@
// !LANGUAGE: +PolymorphicSignature +ProhibitSpreadOnSignaturePolymorphicCall
// FULL_JDK
import java.lang.invoke.MethodHandle
fun test(mh: MethodHandle) {
mh.invokeExact("1", "2")
mh.invokeExact(<!SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL_ERROR!>*<!>emptyArray(), "X")
mh.invokeExact(<!SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL_ERROR!>*<!>arrayOf("A", "B"), "C", <!SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL_ERROR!>*<!>arrayOf("D", "E"))
mh.invoke(<!SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL_ERROR!>*<!>arrayOf("A"))
}
compiler/testData/diagnostics/tests/j+k/polymorphicSignature/spreadOperator_after.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package
public fun test(/*0*/ mh: java.lang.invoke.MethodHandle): kotlin.Unit
compiler/testData/diagnostics/tests/j+k/polymorphicSignature/spreadOperator_before.fir.kt
Vendored
+11
View File
@@ -0,0 +1,11 @@
// !LANGUAGE: +PolymorphicSignature -ProhibitSpreadOnSignaturePolymorphicCall
// FULL_JDK
import java.lang.invoke.MethodHandle
fun test(mh: MethodHandle) {
mh.invokeExact("1", "2")
mh.<!INAPPLICABLE_CANDIDATE!>invokeExact<!>(*emptyArray(), "X")
mh.<!INAPPLICABLE_CANDIDATE!>invokeExact<!>(*arrayOf("A", "B"), "C", *arrayOf("D", "E"))
mh.invoke(*arrayOf("A"))
}
compiler/testData/diagnostics/tests/j+k/polymorphicSignature/spreadOperator_before.kt
Vendored
+11
View File
@@ -0,0 +1,11 @@
// !LANGUAGE: +PolymorphicSignature -ProhibitSpreadOnSignaturePolymorphicCall
// FULL_JDK
import java.lang.invoke.MethodHandle
fun test(mh: MethodHandle) {
mh.invokeExact("1", "2")
mh.invokeExact(<!SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL!>*<!>emptyArray(), "X")
mh.invokeExact(<!SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL!>*<!>arrayOf("A", "B"), "C", <!SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL!>*<!>arrayOf("D", "E"))
mh.invoke(<!SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL!>*<!>arrayOf("A"))
}
compiler/testData/diagnostics/tests/j+k/polymorphicSignature/spreadOperator_before.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package
public fun test(/*0*/ mh: java.lang.invoke.MethodHandle): kotlin.Unit
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
Generated
+23
View File
@@ -13010,6 +13010,29 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
}
}
@TestMetadata("compiler/testData/diagnostics/tests/j+k/polymorphicSignature")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class PolymorphicSignature extends AbstractDiagnosticsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInPolymorphicSignature() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/polymorphicSignature"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@TestMetadata("spreadOperator_after.kt")
public void testSpreadOperator_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/j+k/polymorphicSignature/spreadOperator_after.kt");
}
@TestMetadata("spreadOperator_before.kt")
public void testSpreadOperator_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/j+k/polymorphicSignature/spreadOperator_before.kt");
}
}
@TestMetadata("compiler/testData/diagnostics/tests/j+k/primitiveOverrides")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
Generated
+23
View File
@@ -13005,6 +13005,29 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
}
}
@TestMetadata("compiler/testData/diagnostics/tests/j+k/polymorphicSignature")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class PolymorphicSignature extends AbstractDiagnosticsUsingJavacTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInPolymorphicSignature() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/polymorphicSignature"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@TestMetadata("spreadOperator_after.kt")
public void testSpreadOperator_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/j+k/polymorphicSignature/spreadOperator_after.kt");
}
@TestMetadata("spreadOperator_before.kt")
public void testSpreadOperator_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/j+k/polymorphicSignature/spreadOperator_before.kt");
}
}
@TestMetadata("compiler/testData/diagnostics/tests/j+k/primitiveOverrides")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+2
View File
@@ -127,6 +127,8 @@ enum class LanguageFeature(
ProperIeee754Comparisons(KOTLIN_1_4, kind = BUG_FIX),
FunctionalInterfaceConversion(KOTLIN_1_4, kind = UNSTABLE_FEATURE),
ProhibitSpreadOnSignaturePolymorphicCall(KOTLIN_1_5, kind = BUG_FIX),
// Temporarily disabled, see KT-27084/KT-22379
SoundSmartcastFromLoopConditionForLoopAssignedVariables(sinceVersion = null, kind = BUG_FIX),