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

FIR: check visibility properly for CANNOT_CHANGE_ACCESS_PRIVILEGE

Browse Source
This commit is contained in:
Jinseong Jeon
2021-02-25 23:39:10 -08:00
committed by Mikhail Glukhikh
parent f45af5ea0e
commit c5cabce2d5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirOverrideChecker.kt
+4 -4
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.fir.analysis.checkers.declaration
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibilities
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
@@ -114,14 +115,13 @@ object FirOverrideChecker : FirClassChecker() {
it to (it.fir as FirMemberDeclaration).visibility
}.sortedBy { pair ->
// Regard `null` compare as Int.MIN so that we can report CANNOT_CHANGE_... first deterministically
visibility.compareTo(pair.second) ?: Int.MIN_VALUE
Visibilities.compare(visibility, pair.second) ?: Int.MIN_VALUE
}
for ((overridden, overriddenVisibility) in visibilities) {
val compare = visibility.compareTo(overriddenVisibility)
val compare = Visibilities.compare(visibility, overriddenVisibility)
if (compare == null) {
// TODO: not ready yet (even after determinism massage), e.g., a Kotlin class that extends a Java class
// reporter.reportCannotChangeAccessPrivilege(this, overridden.fir)
reporter.reportCannotChangeAccessPrivilege(this, overridden.fir, context)
return
} else if (compare < 0) {
reporter.reportCannotWeakenAccessPrivilege(this, overridden.fir, context)
compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.fir.kt
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ open class A {
}
class B : A() {
protected override fun foo() {}
<!CANNOT_CHANGE_ACCESS_PRIVILEGE!>protected<!> override fun foo() {}
}
class C : A() {
@@ -48,7 +48,7 @@ class I : H() {
}
class J : H() {
internal override fun pi_fun() {}
<!CANNOT_CHANGE_ACCESS_PRIVILEGE!>internal<!> override fun pi_fun() {}
}
class K : H() {
compiler/testData/diagnostics/tests/scopes/kt151.fir.kt
Vendored
+1 -1
View File
@@ -24,7 +24,7 @@ interface T {
}
class D : C(), T {
protected override fun foo() {}
<!CANNOT_CHANGE_ACCESS_PRIVILEGE!>protected<!> override fun foo() {}
}
class E : C(), T {