Skip to content

Commit

Permalink
Allow override protected[C] in companion
Browse files Browse the repository at this point in the history
When extending C in its companion, allow
override protected[C] where C denotes the
enclosing companion module of C.

Lookup of local companion is broken under
`-from-tasty`, so this accommodation is
disallowed for local companions.
  • Loading branch information
som-snytt committed Feb 2, 2022
1 parent 8bb2453 commit 5979401
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 10 deletions.
23 changes: 13 additions & 10 deletions compiler/src/dotty/tools/dotc/typer/RefChecks.scala
Original file line number Diff line number Diff line change
Expand Up @@ -409,19 +409,21 @@ object RefChecks {
overrideError("has weaker access privileges; it should not be private")

// todo: align accessibility implication checking with isAccessible in Contexts
val ob = other.accessBoundary(member.owner)
val mb = member.accessBoundary(member.owner)
def isOverrideAccessOK =
(member.flags & AccessFlags).isEmpty
&& !member.privateWithin.exists // member is public, or
|| (!other.is(Protected) || member.is(Protected))
// if o is protected, so is m, and
&& (ob.isContainedIn(mb) || other.isAllOf(JavaProtected))
// m relaxes o's access boundary,
// or o is Java defined and protected (see #3946)
val memberIsPublic = (member.flags & AccessFlags).isEmpty && !member.privateWithin.exists
def protectedOK = !other.is(Protected) || member.is(Protected) // if o is protected, so is m
def accessBoundaryOK =
val ob = other.accessBoundary(member.owner)
val mb = member.accessBoundary(member.owner)
// restriction isLocalToBlock because companionModule fails under -from-tasty
def companionBoundaryOK = ob.isClass && !ob.isLocalToBlock && mb.is(Module) && (ob.companionModule eq mb.companionModule)
ob.isContainedIn(mb) || companionBoundaryOK // m relaxes o's access boundary,
def otherIsJavaProtected = other.isAllOf(JavaProtected) // or o is Java defined and protected (see #3946)
memberIsPublic || protectedOK && (accessBoundaryOK || otherIsJavaProtected)
end isOverrideAccessOK
if !member.hasTargetName(other.targetName) then
overrideTargetNameError()
else if (!isOverrideAccessOK)
else if !isOverrideAccessOK then
overrideAccessError()
else if (other.isClass)
// direct overrides were already checked on completion (see Checking.chckWellFormed)
Expand Down Expand Up @@ -502,6 +504,7 @@ object RefChecks {
else
checkOverrideDeprecated()
}
end checkOverride

/* TODO enable; right now the annotation is scala-private, so cannot be seen
* here.
Expand Down
17 changes: 17 additions & 0 deletions tests/neg/t12494.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

object X {
// restriction in Scala 2 for local companions
// restriction in Scala 3 under -from-tasty
def m: Int = {
trait C {
protected[C] def f: Int
}
object C {
class C2 extends C {
protected[C] def f: Int = 42 // error // ok except for restrictions noted
def test = f
}
}
C.C2().test
}
}
10 changes: 10 additions & 0 deletions tests/pos/t12494.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

trait Base {
protected[Base] def f: Int
}
object Base {
class Child extends Base {
protected[Base] def f: Int = 42 // ok
def test = f
}
}

0 comments on commit 5979401

Please sign in to comment.