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.

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

Set missing expansion span for copied inlined node #18229

Merged
merged 1 commit into from
Jul 27, 2023

Conversation

Tetchki
Copy link

@Tetchki Tetchki commented Jul 17, 2023

Check if the copied inlined node's expansion exists, and if not set it to the original node's expansion.

This commit was exctracted from #17055. This simplifies the next step that refactors inlined nodes to keep them until the backend phase.

Tetchki added a commit to Tetchki/dotty that referenced this pull request Jul 17, 2023
Refactoring of inlined nodes to simplify the work on scala#17055.
This work is based on scala#18229.
Tetchki added a commit to Tetchki/dotty that referenced this pull request Jul 17, 2023
Refactoring of inlined nodes to simplify the work on scala#17055.
This work is based on scala#18229.
Tetchki added a commit to Tetchki/dotty that referenced this pull request Jul 17, 2023
Refactoring of inlined nodes to simplify the work on scala#17055.
This work is based on scala#18229.
Copy link
Contributor

@nicolasstucki nicolasstucki 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

compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala Outdated Show resolved Hide resolved
compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala Outdated Show resolved Hide resolved
Copy link
Collaborator

@julienrf julienrf left a comment

Choose a reason for hiding this comment

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

This looks good to me as well, do you mind squashing the commits into a single one before we merge?

Check if the copied inlined node's expansion exists, and if not set it to the original node's expansion
@nicolasstucki nicolasstucki merged commit 4b67b34 into scala:main Jul 27, 2023
17 checks passed
@Kordyjan
Copy link
Contributor

Kordyjan commented Dec 8, 2023

Withdrawing this change from 3.3.2 fixed two problems: #19191 and #18754.

I believe we need to look deeper before the final release of 3.4.0.

@Kordyjan Kordyjan added this to the 3.4.0 milestone Dec 20, 2023
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.

None yet

4 participants