From 5291648d39edaf45bedb055b4372bc6053d5b6f3 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Tue, 3 Aug 2021 22:31:27 +0300 Subject: [PATCH] [FIR] Temporary change UPPER_BOUND_VIOLATED to warning to unblock bootstrap tests --- .../testData/resolve/diagnostics/upperBoundViolated.kt | 6 ++++++ .../checkers/generator/diagnostics/FirDiagnosticsList.kt | 2 +- .../jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.kt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.kt index 2266b07eb4b..e855ef956fd 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.kt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.kt @@ -66,3 +66,9 @@ class Test8in Any>> class Class typealias Alias = (Class) -> Boolean +/* TODO: Should not be errors. Uncomment after fixing of https://youtrack.jetbrains.com/issue/KT-48044 +abstract class Base> {} +class DerivedOut> {} +class DerivedIn> {}*/ + + diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt index 2b2f9b97d09..713622fcfe4 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt @@ -443,7 +443,7 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") { val RECURSION_IN_IMPLICIT_TYPES by error() val INFERENCE_ERROR by error() val PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT by error() - val UPPER_BOUND_VIOLATED by error { + val UPPER_BOUND_VIOLATED by warning { parameter("expectedUpperBound") parameter("actualUpperBound") } diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt index 4a9c0c1005a..fcb7884fb9a 100644 --- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt +++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt @@ -309,7 +309,7 @@ object FirErrors { val RECURSION_IN_IMPLICIT_TYPES by error0() val INFERENCE_ERROR by error0() val PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT by error0() - val UPPER_BOUND_VIOLATED by error2() + val UPPER_BOUND_VIOLATED by warning2() val UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION by error2() val TYPE_ARGUMENTS_NOT_ALLOWED by error0() val WRONG_NUMBER_OF_TYPE_ARGUMENTS by error2()