From 70dc5b54033cae93eb9a4e0f3939794248d582fb Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 19 Jan 2016 11:03:39 +0300 Subject: [PATCH] Prohibit use of captured type as argument for reified parameter #KT-8093 Fixed --- .../tests/generics/tpAsReified/CapturedAsReified.kt | 8 ++++++++ .../tests/generics/tpAsReified/CapturedAsReified.txt | 11 +++++++++++ .../kotlin/checkers/DiagnosticsTestGenerated.java | 6 ++++++ .../src/org/jetbrains/kotlin/types/TypeUtils.kt | 4 +++- 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.kt create mode 100644 compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.txt diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.kt b/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.kt new file mode 100644 index 00000000000..97b84e5fdb2 --- /dev/null +++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.kt @@ -0,0 +1,8 @@ +// !DIAGNOSTICS: -UNUSED_PARAMETER +class A + +inline fun foo(x: A) {} + +fun test(x: A) { + foo(x) +} diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.txt b/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.txt new file mode 100644 index 00000000000..8ac6e448ce9 --- /dev/null +++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.txt @@ -0,0 +1,11 @@ +package + +public inline fun foo(/*0*/ x: A): kotlin.Unit +public fun test(/*0*/ x: A): kotlin.Unit + +public final class A { + public constructor A() + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java index e22562baff9..3ba65347baa 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java @@ -7376,6 +7376,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/tpAsReified"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("CapturedAsReified.kt") + public void testCapturedAsReified() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.kt"); + doTest(fileName); + } + @TestMetadata("Conventions.kt") public void testConventions() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.kt"); diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.kt index a38e4928c3a..c7a557ad062 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.calls.inference.isCaptured import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.checker.KotlinTypeChecker import java.util.* @@ -66,7 +67,8 @@ fun KotlinType?.isArrayOfNothing(): Boolean { fun KotlinType.isSubtypeOf(superType: KotlinType): Boolean = KotlinTypeChecker.DEFAULT.isSubtypeOf(this, superType) -fun KotlinType.cannotBeReified(): Boolean = KotlinBuiltIns.isNothingOrNullableNothing(this) || this.isDynamic() +fun KotlinType.cannotBeReified(): Boolean = + KotlinBuiltIns.isNothingOrNullableNothing(this) || this.isDynamic() || this.isCaptured() fun KotlinType.unsafeAsReifiedArgument(): Boolean = arguments.any { !it.isStarProjection } fun TypeProjection.substitute(doSubstitute: (KotlinType) -> KotlinType): TypeProjection {