Skip to content
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

Jump to bottom

Fix staging using inline methods in quotes #10803

Merged
merged 2 commits into from
Dec 15, 2020
Merged

Fix staging using inline methods in quotes #10803

merged 2 commits into from
Dec 15, 2020

Conversation

nicolasstucki
Copy link
Contributor

@nicolasstucki nicolasstucki commented Dec 15, 2020 •
edited
Loading

Follow-up of #10781.

@nicolasstucki
Copy link
Contributor Author

This includes a partial version of the code in #9984 that is enough for the use-case in staging.

@nicolasstucki nicolasstucki self-assigned this Dec 15, 2020
@nicolasstucki nicolasstucki marked this pull request as ready for review December 15, 2020 14:15
@nicolasstucki nicolasstucki added this to the 3.0.0-M3 milestone Dec 15, 2020
@nicolasstucki nicolasstucki mentioned this pull request Dec 15, 2020
Merged
liufengyun
liufengyun approved these changes Dec 15, 2020
View reviewed changes
Copy link
Contributor

@liufengyun liufengyun left a comment

Choose a reason for hiding this comment

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

LGTM

It seems tests/disabled/run-staging/i3876-e.scala can be enabled as well.

compiler/src/dotty/tools/dotc/transform/Inlining.scala
import dotty.tools.dotc.quoted._
import dotty.tools.dotc.transform.TreeMapWithStages._
import dotty.tools.dotc.typer.Inliner
import dotty.tools.dotc.typer.ImportInfo.withRootImports
Copy link
Contributor

Choose a reason for hiding this comment

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

This import seems to be not used.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Those are from #9984. I kept them to simplify the merge afterward.

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 will cleanup all imports in #9984

compiler/src/dotty/tools/dotc/transform/Inlining.scala Show resolved Hide resolved
compiler/src/dotty/tools/dotc/transform/Inlining.scala Show resolved Hide resolved
compiler/src/dotty/tools/dotc/transform/Inlining.scala Show resolved Hide resolved
@bishabosha bishabosha merged commit 7d715fe into scala:master Dec 15, 2020
@bishabosha bishabosha deleted the fix-staging-inline-calls-in-quotes branch December 15, 2020 17:42
@Kordyjan Kordyjan modified the milestones: 3.0.0-M3, 3.0.0 Aug 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liufengyun liufengyun liufengyun approved these changes

Assignees

@liufengyun liufengyun

Labels
None yet
Projects
None yet
Milestone
3.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@nicolasstucki @liufengyun @Kordyjan @bishabosha