Fix extending protected nested java classes #21857
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eed3si9n
reviewed
Oct 29, 2024
compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
Outdated
Show resolved
Hide resolved
eed3si9n
reviewed
Oct 29, 2024
PR 21362 added an accessibility fix to Erasure, but that revealed a mistake in determining the accessibility of inner java classes, which I'm now fixing.
dwijnand
force-pushed
the
protected-sep-comp-java
branch
from
8b8d3bf
to
17dadf7
Compare
lrytz
reviewed
Oct 31, 2024
| @@ -401,7 +401,8 @@ class ClassfileParser( | |||
| classRoot.setFlag(sflags) | |||
| moduleRoot.setFlag(Flags.JavaDefined | Flags.ModuleClassCreationFlags) | |||
|
|
|||
| val privateWithin = getPrivateWithin(jflags) | |||
| val jflags1 = innerClasses.get(currentClassName.toString).fold(jflags: Int)(_.jflags) | |||
| val privateWithin = getPrivateWithin(jflags1) | |||
There was a problem hiding this comment.
Scala 2 sets the privateWithin for inner classes when creating the symbol in enterOwnInnerClasses
Maybe Scala 3 should also do it there?
dwijnand
force-pushed
the
protected-sep-comp-java
branch
from
282f8d3
to
350215d
Compare
lrytz
approved these changes
Nov 5, 2024
| new ClassfileLoader(file), | ||
| classTranslation.flags(jflags), | ||
| getScope(jflags)) | ||
|
|
||
| val privateWithin = getPrivateWithin(jflags) |
There was a problem hiding this comment.
if privateWithin.exists then here as well for consistency?
lrytz
approved these changes
Nov 5, 2024
WojciechMazur
added
the
backport:nominated
WojciechMazur
added a commit
that referenced
this pull request
Nov 8, 2024
Backports #21857 to the 3.6.2 branch. PR submitted by the release tooling. [skip ci]
WojciechMazur
added
backport:done
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #21631