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

[FIR] Relax incompatibleEnumAndUnrelatedInterfaceThroughTypeParameter

Browse Source
This commit is contained in:
Nikolay Lunyak
2023-10-18 18:04:33 +03:00
committed by Space Team
parent 3058f2eaff
commit c6bec2fa75
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirEqualityCompatibilityChecker.kt
+3 -3
View File
@@ -53,9 +53,9 @@ object FirEqualityCompatibilityChecker : FirEqualityOperatorCallChecker() {
// sees a non-empty intersection and none of the // sees a non-empty intersection and none of the
// types is an enum, but intersections in K1 // types is an enum, but intersections in K1
// work differently from intersections in K2. // work differently from intersections in K2.
val isCaseMissedByK1 = (l.originalTypeInfo.isEnumClass == r.originalTypeInfo.isEnumClass) val isCaseMissedByK1 = (l.originalTypeInfo.isLiterallyTypeParameter && r.originalTypeInfo.isLiterallyTypeParameter)
&& l.originalTypeInfo.isLiterallyTypeParameter || (l.originalTypeInfo.isLiterallyTypeParameter && r.originalTypeInfo.isEnumClass)
&& r.originalTypeInfo.isLiterallyTypeParameter || (l.originalTypeInfo.isEnumClass && r.originalTypeInfo.isLiterallyTypeParameter)
val replicateK1Behavior = !context.languageVersionSettings.supportsFeature(LanguageFeature.ReportErrorsForComparisonOperators) val replicateK1Behavior = !context.languageVersionSettings.supportsFeature(LanguageFeature.ReportErrorsForComparisonOperators)
return reporter.reportInapplicabilityDiagnostic( return reporter.reportInapplicabilityDiagnostic(
compiler/testData/diagnostics/testsWithStdLib/equalityCompatibilityCommonCases.fir.kt
Vendored
+1 -1
View File
@@ -107,6 +107,6 @@ interface A
enum class G : B enum class G : B
fun <I : A> incompatibleEnumAndUnrelatedInterfaceThroughTypeParameter(x: G?, i: I?) { fun <I : A> incompatibleEnumAndUnrelatedInterfaceThroughTypeParameter(x: G?, i: I?) {
<!INCOMPATIBLE_ENUM_COMPARISON_ERROR!>x == i<!> <!INCOMPATIBLE_ENUM_COMPARISON!>x == i<!>
} }