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

FE: fix effective visibility bound calculation logic

Browse Source 
#KT-58757 Fixed
#KT-58840 Fixed
This commit is contained in:
Mikhail Glukhikh
2023-05-19 17:42:36 +02:00
committed by Space Team
parent c130786889
commit 2fcd296db8
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/inline/nonPublicMember/protectedInlineInsideInternal.fir.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// ISSUE: KT-58757
internal abstract class Foo {
abstract val context: CharSequence
}
internal abstract class Bar(protected val foo: Foo) {
protected inline val inlineContext: String
get() = <!NON_PUBLIC_CALL_FROM_PUBLIC_INLINE!>foo<!>.<!NON_PUBLIC_CALL_FROM_PUBLIC_INLINE!>context<!> as String
}
compiler/testData/diagnostics/tests/inline/nonPublicMember/protectedInlineInsideInternal.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// ISSUE: KT-58757 // ISSUE: KT-58757
internal abstract class Foo { internal abstract class Foo {
core/compiler.common/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt
+5 -5
View File
@@ -121,12 +121,12 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
Public -> this Public -> this
PrivateInClass, PrivateInFile, Local, ProtectedBound, InternalProtectedBound -> other PrivateInClass, PrivateInFile, Local, ProtectedBound, InternalProtectedBound -> other
is Protected -> when (relation(other, typeCheckerContextProvider)) { is Protected -> when (relation(other, typeCheckerContextProvider)) {
Permissiveness.SAME, Permissiveness.MORE -> this Permissiveness.SAME, Permissiveness.LESS -> this
Permissiveness.LESS -> other Permissiveness.MORE -> other
Permissiveness.UNKNOWN -> ProtectedBound Permissiveness.UNKNOWN -> ProtectedBound
} }
is InternalProtected -> when (relation(other, typeCheckerContextProvider)) { is InternalProtected -> when (relation(other, typeCheckerContextProvider)) {
Permissiveness.LESS -> other Permissiveness.MORE -> other
else -> InternalProtectedBound else -> InternalProtectedBound
} }
is InternalOrPackage -> InternalProtected(containerTypeConstructor) is InternalOrPackage -> InternalProtected(containerTypeConstructor)
@@ -192,8 +192,8 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
Public, is InternalOrPackage -> this Public, is InternalOrPackage -> this
PrivateInClass, PrivateInFile, Local, InternalProtectedBound -> other PrivateInClass, PrivateInFile, Local, InternalProtectedBound -> other
is Protected, is InternalProtected -> when (relation(other, typeCheckerContextProvider)) { is Protected, is InternalProtected -> when (relation(other, typeCheckerContextProvider)) {
Permissiveness.SAME, Permissiveness.MORE -> this Permissiveness.SAME, Permissiveness.LESS -> this
Permissiveness.LESS -> other Permissiveness.MORE -> other
Permissiveness.UNKNOWN -> InternalProtectedBound Permissiveness.UNKNOWN -> InternalProtectedBound
} }
ProtectedBound -> InternalProtectedBound ProtectedBound -> InternalProtectedBound