[FIR] Add REIFIED_TYPE_PARAMETER_NO_INLINE check

This commit is contained in:
Andrey Zinovyev
2021-04-11 20:18:34 +03:00
committed by TeamCityServer
parent 14fe570a00
commit 5ff82addc9
16 changed files with 46 additions and 47 deletions
@@ -0,0 +1,36 @@
/*
* Copyright 2010-2021 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.fir.analysis.checkers.declaration
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.lexer.KtTokens
object FirReifiedTypeParameterChecker : FirTypeParameterChecker() {
override fun check(declaration: FirTypeParameter, context: CheckerContext, reporter: DiagnosticReporter) {
if (!declaration.isReified) return
val containingDeclaration = context.containingDeclarations.lastOrNull() ?: return
val forbidReified = (containingDeclaration is FirRegularClass) ||
(containingDeclaration is FirSimpleFunction && !containingDeclaration.isInline) ||
(containingDeclaration is FirProperty && !containingDeclaration.areAccessorsInline())
if (forbidReified) {
val reportTarget = declaration.getModifier(KtTokens.REIFIED_KEYWORD)?.source
reporter.reportOn(reportTarget, FirErrors.REIFIED_TYPE_PARAMETER_NO_INLINE, context)
}
}
private fun FirProperty.areAccessorsInline(): Boolean {
if (getter?.isInline != true) return false
if (isVar && setter?.isInline != true) return false
return true
}
}
@@ -94,5 +94,6 @@ object CommonDeclarationCheckers : DeclarationCheckers() {
override val typeParameterCheckers: Set<FirTypeParameterChecker> = setOf(
FirTypeParameterBoundsChecker,
FirTypeParameterVarianceChecker,
FirReifiedTypeParameterChecker,
)
}
@@ -1,5 +1,5 @@
// !WITH_NEW_INFERENCE
class C<reified T>
class C<<!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T>
fun <T> id(p: T): T = p
@@ -1,2 +0,0 @@
val <reified T> T.v: T
get() = throw UnsupportedOperationException()
@@ -1,2 +1,3 @@
// FIR_IDENTICAL
val <<!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T> T.v: T
get() = throw UnsupportedOperationException()
@@ -1,4 +0,0 @@
class C<reified T>
fun <A> main(p1: C<A>, p2: C<Int>) {
}
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
class C<<!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T>
fun <A> main(p1: C<A>, p2: C<Int>) {
@@ -1,9 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -NOT_YET_SUPPORTED_IN_INLINE
inline fun<reified T> foo(x: T) {
fun<reified R> bar() {
}
bar<T>()
}
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER -NOT_YET_SUPPORTED_IN_INLINE
inline fun<reified T> foo(x: T) {
@@ -1,4 +0,0 @@
fun<T1, reified T2, T3, reified T4> foo() {
}
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
fun<T1, <!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T2, T3, <!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T4> foo() {
@@ -1,3 +0,0 @@
class A<T1, reified T2, T3, reified T4> {
fun<reified R> foo(): T2 = throw UnsupportedOperationException()
}
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
class A<T1, <!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T2, T3, <!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T4> {
fun<<!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> R> foo(): T2 = throw UnsupportedOperationException()
}
@@ -1,22 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
//KT-4372 Invalid error position and failing to resolve invoke with receiver from other module
class Foo<TInner, TOuter> {
fun invoke(content: TInner.() -> Unit) {
}
}
// comment this function to fix the error below
fun <TInner, TOuter> Foo<TInner, TOuter>.invoke(name: String, content: TInner.() -> Unit) {}
enum class EnumClass(val x: String) {}
object Y {
val x = javaClass<EnumClass>() // javaClass unresolved in any file in this module
}
//declarations from library
val <T> T.javaClass : Class<T>
get() = throw Exception()
fun <reified T> javaClass() : Class<T> = throw Exception()
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
//KT-4372 Invalid error position and failing to resolve invoke with receiver from other module
@@ -1,4 +1,4 @@
import kotlin.jvm.*
external fun <reified T> foo()
inline external fun <reified T> bar()
external fun <<!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T> foo()
inline external fun <reified T> bar()