Skip to content

Fix compiler crash with -Ymagic-offset-header #24124

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
Merged
merged 2 commits into from
Oct 3, 2025
Merged

Fix compiler crash with -Ymagic-offset-header #24124

merged 2 commits into from
Oct 3, 2025

Conversation

@lihaoyi
Copy link
Contributor

@lihaoyi lihaoyi commented Oct 2, 2025 •
edited
Loading

Fixes #24091

Since span.start is only valid when span.exists, we just check that first before calling span.start and otherwise fall back to the default code path

Haven't tested it, but from the stack trace it looks like it should fix the problem

tgodzik
tgodzik approved these changes Oct 2, 2025
View reviewed changes
Copy link
Contributor

@tgodzik tgodzik left a comment

Choose a reason for hiding this comment

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

LGTM!

@lihaoyi
Copy link
Contributor Author

lihaoyi commented Oct 2, 2025

Thanks @tgodzik ! Could I request for a backport to 3.7.4?

@tgodzik
Copy link
Contributor

tgodzik commented Oct 2, 2025

Thanks @tgodzik ! Could I request for a backport to 3.7.4?

I think we'll have an RC2 @WojciechMazur ?

@noti0na1 noti0na1 requested a review from Linyxus October 2, 2025 16:22
Linyxus
Linyxus approved these changes Oct 2, 2025
View reviewed changes
Copy link
Contributor

@Linyxus Linyxus left a comment

Choose a reason for hiding this comment

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

LGTM!

@Linyxus
Copy link
Contributor

Linyxus commented Oct 2, 2025

Before merging, could you squash and rename the commits? Right now they are not quite informative.

@Linyxus Linyxus assigned lihaoyi and unassigned Linyxus Oct 2, 2025
@tgodzik
Copy link
Contributor

tgodzik commented Oct 2, 2025

I will do it with the squash on github, it does use the PR description in those cases

@WojciechMazur WojciechMazur added the backport:nominated If we agree to backport this PR, replace this tag with "backport:accepted", otherwise delete it. label Oct 2, 2025
@tgodzik tgodzik merged commit a7bbe58 into scala:main Oct 3, 2025
49 checks passed
@tgodzik tgodzik modified the milestones: 3.8.0, 3.7.4 Oct 13, 2025
@WojciechMazur WojciechMazur mentioned this pull request Oct 22, 2025
Merged
WojciechMazur added a commit that referenced this pull request Oct 22, 2025
@WojciechMazur
Backport "Fix compiler crash with -Ymagic-offset-header" to 3.7.4 (#…
3557626 
…24226)

Backports #24124 to the 3.7.4.

PR submitted by the release tooling.
[skip ci]
@WojciechMazur WojciechMazur added backport:done This PR was successfully backported. and removed backport:nominated If we agree to backport this PR, replace this tag with "backport:accepted", otherwise delete it. labels Oct 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tgodzik tgodzik tgodzik approved these changes

@Linyxus Linyxus Linyxus approved these changes

Assignees

@lihaoyi lihaoyi

Labels

backport:done This PR was successfully backported.

Projects

None yet

Milestone

3.7.4

Development

Successfully merging this pull request may close these issues.

Compiler crash with -Ymagic-offset-header

4 participants

@lihaoyi @tgodzik @Linyxus @WojciechMazur