Skip to content

Make annotation reading lazier in Scala2Unpickler #12117

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 4 commits into from
Apr 19, 2021

Conversation

odersky
Copy link
Contributor

@odersky odersky commented Apr 16, 2021

Checking whether we need eta expansion needs type parameters which can provoke a cycle.

Fixes #12109.

@odersky odersky changed the title Don't eta expand when reading Scala 2 types Make annotation reading lazier in Scala2Unpickler Apr 17, 2021
@odersky odersky marked this pull request as ready for review April 17, 2021 14:36
odersky added 2 commits April 17, 2021 17:03
Eta expansion needs type parameters which can provoke a cycle.

Fixes scala#12109.
Fixes scala#12109 without causing problems elsewhere.
Copy link
Member

@smarter smarter left a comment

Choose a reason for hiding this comment

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

Otherwise LGTM

@@ -0,0 +1 @@
sbt.version=1.3.12
Copy link
Member

Choose a reason for hiding this comment

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

That build.properties file isn't needed for a scripted test.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I copied everything from the scala-compat test that you added recently.

Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I don't see that file in https://github.com/lampepfl/dotty/pull/12120/files, it might have been auto-generated by sbt.

@smarter smarter enabled auto-merge April 19, 2021 10:13
@smarter smarter merged commit 0ca0b9e into scala:master Apr 19, 2021
@smarter smarter deleted the fix-12109 branch April 19, 2021 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cyclic reference involving module class in Scala3 but compiles in Scala2
2 participants