-
Notifications
You must be signed in to change notification settings - Fork 1.1k
fix: Drop copied parent refinements before generating bytecode #21733
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.
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
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
5a73a68
fix: Drop copied parent refinements before generating bytecode
KacperFKorban a1a32d1
Fix printint tests
KacperFKorban 9b1e1c9
Update compiler/src/dotty/tools/dotc/typer/Typer.scala
KacperFKorban 7350a42
Update compiler/src/dotty/tools/dotc/transform/DropParentRefinements.…
KacperFKorban File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
35 changes: 35 additions & 0 deletions
35
compiler/src/dotty/tools/dotc/transform/DropParentRefinements.scala
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
package dotty.tools.dotc.transform | ||
|
||
import dotty.tools.dotc.transform.MegaPhase.MiniPhase | ||
import dotty.tools.dotc.ast.tpd | ||
import dotty.tools.dotc.core.Contexts.Context | ||
import dotty.tools.dotc.core.DenotTransformers.IdentityDenotTransformer | ||
import dotty.tools.dotc.typer.Typer | ||
|
||
object DropParentRefinements: | ||
val name: String = "dropParentRefinements" | ||
val description: String = "drop parent refinements from a template" | ||
|
||
/** Drop parent refinements from a template, as they are generated without | ||
* an implementation. These refinements are unusally required for tracked | ||
* members with more specific types. | ||
*/ | ||
class DropParentRefinements extends MiniPhase with IdentityDenotTransformer: | ||
thisPhase => | ||
import tpd.* | ||
|
||
override def phaseName: String = DropParentRefinements.name | ||
|
||
override def description: String = DropParentRefinements.description | ||
|
||
override def runsAfterGroupsOf: Set[String] = Set(CountOuterAccesses.name) | ||
|
||
override def changesMembers: Boolean = true // the phase drops parent refinements | ||
|
||
override def transformTemplate(tree: tpd.Template)(using Context): tpd.Tree = | ||
val newBody = tree.body.filter(!_.hasAttachment(Typer.RefinementFromParent)) | ||
tree.body.foreach { member => | ||
if member.hasAttachment(Typer.RefinementFromParent) then | ||
member.symbol.dropAfter(thisPhase) | ||
} | ||
cpy.Template(tree)(body = newBody) |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
bar |
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import scala.language.experimental.modularity | ||
import scala.language.future | ||
|
||
sealed abstract class Foo(tracked val discriminator: String) | ||
class Bar extends Foo("bar") | ||
|
||
val bar: Foo = Bar() | ||
object Test extends App: | ||
println(bar.discriminator) |
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
bar |
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import scala.language.experimental.modularity | ||
import scala.language.future | ||
|
||
enum Foo(tracked val discriminator: String): | ||
case Bar() extends Foo("bar") | ||
case Baz() extends Foo("baz") | ||
|
||
val bar: Foo = Foo.Bar() | ||
object Test extends App: | ||
println(bar.discriminator) |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.