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

[JS FIR] Fix REIFIED_TYPE_FORBIDDEN_SUBSTITUTION for dynamic types

Browse Source 
^KT-59987 Fixed
This commit is contained in:
Alexander Korepanov
2024-01-22 13:38:30 +01:00
committed by Space Team
parent 6db22b4975
commit 0d06efb488
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReifiedChecker.kt
+8 -3
View File
@@ -11,8 +11,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.diagnostics.chooseFactory
import org.jetbrains.kotlin.diagnostics.reportOn
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.analysis.checkers.fullyExpandedClassId
import org.jetbrains.kotlin.fir.analysis.diagnostics.*
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
import org.jetbrains.kotlin.fir.references.toResolvedCallableSymbol
import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
@@ -54,6 +53,12 @@ object FirReifiedChecker : FirQualifiedAccessExpressionChecker() {
containingDeclaration is FirRegularClassSymbol && containingDeclaration.classId == StandardClassIds.Array
}
private fun ConeKotlinType.cannotBeReified() = when (this) {
is ConeCapturedType -> true
is ConeDynamicType -> true
else -> isNothing || isNullableNothing
}
private fun checkArgumentAndReport(
typeArgument: ConeKotlinType,
source: KtSourceElement,
@@ -85,7 +90,7 @@ object FirReifiedChecker : FirQualifiedAccessExpressionChecker() {
} else if (typeArgument is ConeDefinitelyNotNullType && isExplicit) {
// We sometimes infer type arguments to DNN types, which seems to be ok. Only report explicit DNN types written by user.
reporter.reportOn(source, FirErrors.DEFINITELY_NON_NULLABLE_AS_REIFIED, context)
} else if (typeArgument.isNothing || typeArgument.isNullableNothing || typeArgument is ConeCapturedType) {
} else if (typeArgument.cannotBeReified()) {
reporter.reportOn(source, FirErrors.REIFIED_TYPE_FORBIDDEN_SUBSTITUTION, typeArgument, context)
}
}
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/reified.fir.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -REIFIED_TYPE_PARAMETER_NO_INLINE
fun <reified T> foo(t: T) {}
class C<reified T>(t: T)
fun test(d: dynamic) {
foo<dynamic>(d)
foo(d)
C<dynamic>(d)
C(d)
}
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/reified.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER -REIFIED_TYPE_PARAMETER_NO_INLINE
fun <reified T> foo(t: T) {}