Skip to content

Fix #13503 by adding a "catch all" clause in pickleDef pattern match #13504

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

Closed
wants to merge 3 commits into from
Closed

Fix #13503 by adding a "catch all" clause in pickleDef pattern match #13504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bab97d
Fix #13503 by adding a "catch all" clause in `pickleDef` pattern match
soronpo Sep 10, 2021
d8befa6
Update compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
soronpo Sep 13, 2021
615653a
Update compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
soronpo Sep 13, 2021
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
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ class TreePickler(pickler: TastyPickler) {
pickleName(sym.name)
pickleParams
tpt match {
case _: Template | _: Hole => pickleTree(tpt)
case _: Template | _: Literal | _: Hole => pickleTree(tpt)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the problem is in the typer, not the pickler. Literal is not a TypeTree so it shouldn't show up in tpt, I would expect a TypeTree(ConstantType(Constant(123))) instead /cc @nicolasstucki

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So is there anything wrong with my initial commit that just ignores Literal? Is there really a problem in the typer?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well we do need to pickle the type to be able to restore it in unpickling so I don't see how the tpt field could be ignored.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, your first commit fails with

[info] Test dotty.tools.dotc.CompilationTests.pickling started
java.lang.AssertionError: assertion failed: illegal modifier tag 111 at Addr(333), end = Addr(331) while compiling tests/pos/i13503.scala

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TypeTree(ConstantType(Constant(123))) makes more sense. We should find where this tree is created and try to change it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wondering if Ycheck should have caught this as it is a TermTree used as a type tree.

case _ if tpt.isType => pickleTpt(tpt)
}
pickleTreeUnlessEmpty(rhs)
Expand Down
7 changes: 7 additions & 0 deletions tests/pos/i13503.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
trait First {type Out}
given First with {type Out = 123}

trait Second {type Out}
transparent inline given (using f: First): Second = new Second {type Out = f.Out}

val s = summon[Second]