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

Fix ICE when passing DefId-creating args to legacy_const_generics. #130443

Merged
merged 1 commit into from
Nov 16, 2024

Conversation

veluca93
Copy link
Contributor

@veluca93 veluca93 commented Sep 16, 2024

r? BoxyUwU

Fixes #123077
Fixes #129150

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 16, 2024
@veluca93 veluca93 force-pushed the legacy-const-generics-fix branch from a598998 to 77a3a5e Compare September 16, 2024 19:02
@BoxyUwU
Copy link
Member

BoxyUwU commented Sep 16, 2024

@bors try

@bors
Copy link
Contributor

bors commented Sep 16, 2024

⌛ Trying commit 77a3a5e with merge 52464d1...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 16, 2024
…r=<try>

Fix ICE when passing DefId-creating args to legacy_const_generics.

r? BoxyUwU

Fixes rust-lang#123077
@rust-log-analyzer

This comment has been minimized.

@veluca93 veluca93 force-pushed the legacy-const-generics-fix branch from 77a3a5e to 193df11 Compare September 16, 2024 20:04
@BoxyUwU
Copy link
Member

BoxyUwU commented Sep 16, 2024

@bors try
(pushing commits cancels the try run xd)

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 16, 2024
…r=<try>

Fix ICE when passing DefId-creating args to legacy_const_generics.

r? BoxyUwU

Fixes rust-lang#123077
Fixes rust-lang#129150
@bors
Copy link
Contributor

bors commented Sep 16, 2024

⌛ Trying commit 193df11 with merge 47af3d0...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Sep 16, 2024

☀️ Try build successful - checks-actions
Build commit: 47af3d0 (47af3d0de9d26c7deba4cfb203b710cc3f764e91)

@compiler-errors
Copy link
Member

@craterbot check

@craterbot
Copy link
Collaborator

👌 Experiment pr-130443 created and queued.
🤖 Automatically detected try build 47af3d0
🔍 You can check out the queue and this experiment's details.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbot craterbot added S-waiting-on-crater Status: Waiting on a crater run to be completed. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 16, 2024
@veluca93 veluca93 force-pushed the legacy-const-generics-fix branch from 193df11 to 5c5e12f Compare September 17, 2024 07:55
@rust-log-analyzer

This comment has been minimized.

@veluca93 veluca93 force-pushed the legacy-const-generics-fix branch from 5c5e12f to 300d8f6 Compare September 17, 2024 09:13
@rust-log-analyzer

This comment has been minimized.

@veluca93 veluca93 force-pushed the legacy-const-generics-fix branch from 300d8f6 to ee70cbf Compare September 17, 2024 11:25
@bors
Copy link
Contributor

bors commented Sep 22, 2024

☔ The latest upstream changes (presumably #130674) made this pull request unmergeable. Please resolve the merge conflicts.

@craterbot
Copy link
Collaborator

🚧 Experiment pr-130443 is now running

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbot
Copy link
Collaborator

🎉 Experiment pr-130443 is completed!
📊 3 regressed and 0 fixed (513940 total)
📰 Open the full report.

⚠️ If you notice any spurious failure please add them to the blacklist!
ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbot craterbot removed the S-waiting-on-crater Status: Waiting on a crater run to be completed. label Sep 26, 2024
@veluca93 veluca93 force-pushed the legacy-const-generics-fix branch from b4bd8fb to 44fb7f3 Compare November 5, 2024 18:30
@rfcbot rfcbot added finished-final-comment-period The final comment period is finished for this PR / Issue. to-announce Announce this issue on triage meeting and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Nov 9, 2024
@rfcbot
Copy link

rfcbot commented Nov 9, 2024

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

This will be merged soon.

compiler/rustc_ast_lowering/messages.ftl Outdated Show resolved Hide resolved
compiler/rustc_ast_lowering/src/expr.rs Outdated Show resolved Hide resolved
@BoxyUwU BoxyUwU added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-fcp Status: PR is in FCP and is awaiting for FCP to complete. labels Nov 15, 2024
@veluca93 veluca93 force-pushed the legacy-const-generics-fix branch from 44fb7f3 to c664250 Compare November 15, 2024 23:01
@rustbot
Copy link
Collaborator

rustbot commented Nov 15, 2024

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@veluca93
Copy link
Contributor Author

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged. Otherwise, you can ignore this comment.

That's from re-adding the pretty printer as a dep in rustc_ast_lowering.

@rust-log-analyzer

This comment has been minimized.

@veluca93 veluca93 force-pushed the legacy-const-generics-fix branch from c664250 to 75552b3 Compare November 15, 2024 23:40
@veluca93 veluca93 force-pushed the legacy-const-generics-fix branch from 75552b3 to b462c68 Compare November 16, 2024 00:08
@BoxyUwU
Copy link
Member

BoxyUwU commented Nov 16, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Nov 16, 2024

📌 Commit b462c68 has been approved by BoxyUwU

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 16, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 16, 2024
…, r=BoxyUwU

Fix ICE when passing DefId-creating args to legacy_const_generics.

r? BoxyUwU

Fixes rust-lang#123077
Fixes rust-lang#129150
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 16, 2024
…, r=BoxyUwU

Fix ICE when passing DefId-creating args to legacy_const_generics.

r? BoxyUwU

Fixes rust-lang#123077
Fixes rust-lang#129150
@bors
Copy link
Contributor

bors commented Nov 16, 2024

⌛ Testing commit b462c68 with merge 46e8d20...

@bors
Copy link
Contributor

bors commented Nov 16, 2024

☀️ Test successful - checks-actions
Approved by: BoxyUwU
Pushing 46e8d20 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 16, 2024
@bors bors merged commit 46e8d20 into rust-lang:master Nov 16, 2024
7 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 16, 2024
@@ -9,6 +9,7 @@ doctest = false
[dependencies]
# tidy-alphabetical-start
rustc_ast = { path = "../rustc_ast" }
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
Copy link
Member

Choose a reason for hiding this comment

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

Was this already a transitive dep, or did this change reduce build parallelism?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was a dep through rustc_errors (and it also was a direct dep ~10 days ago: b480f0f)

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (46e8d20): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary -2.3%, secondary -3.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.3% [-2.3%, -2.3%] 1
Improvements ✅
(secondary)
-3.1% [-3.1%, -3.1%] 1
All ❌✅ (primary) -2.3% [-2.3%, -2.3%] 1

Cycles

Results (secondary -10.3%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-10.3% [-16.0%, -4.6%] 2
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 791.497s -> 788.11s (-0.43%)
Artifact size: 335.43 MiB -> 335.43 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. finished-final-comment-period The final comment period is finished for this PR / Issue. I-lang-easy-decision Issue: The decision needed by the team is conjectured to be easy; this does not imply nomination merged-by-bors This PR was explicitly merged by bors. relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. to-announce Announce this issue on triage meeting
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ICE: node_type: no type for node HirId( ICE: thir: LocalTableInContext: key not found