Skip to content

Fix #5492: Inline accesses to private package members #8459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2020
Merged

Fix #5492: Inline accesses to private package members #8459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions compiler/src/dotty/tools/dotc/transform/AccessProxies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ abstract class AccessProxies {
val accessed = reference.symbol.asTerm
var accessorClass = hostForAccessorOf(accessed: Symbol)
if (accessorClass.exists) {
if accessorClass.is(Package) then
accessorClass = ctx.owner.topLevelClass
val accessorName = accessorNameKind(accessed.name)
val accessorInfo =
accessed.info.ensureMethodic.asSeenFrom(accessorClass.thisType, accessed.owner)
Expand Down Expand Up @@ -159,8 +161,9 @@ object AccessProxies {
def hostForAccessorOf(accessed: Symbol)(implicit ctx: Context): Symbol = {
def recur(cls: Symbol): Symbol =
if (!cls.exists) NoSymbol
else if (cls.derivesFrom(accessed.owner) ||
cls.companionModule.moduleClass == accessed.owner) cls
else if cls.derivesFrom(accessed.owner)
|| cls.companionModule.moduleClass == accessed.owner
then cls
else recur(cls.owner)
recur(ctx.owner)
}
Expand Down
13 changes: 13 additions & 0 deletions tests/pos/i5492.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package foo {
object A {
inline def f(x: Int) = B.f(x)
}

private[foo] object B {
def f(x: Int) = x * 5
}
}

class Test {
val x = foo.A.f(4)
}