Construct tokens for attrs made by mk_attr_word and other variants#159277
Open
mu001999 wants to merge 1 commit into
Open
Construct tokens for attrs made by mk_attr_word and other variants#159277mu001999 wants to merge 1 commit into
tokens for attrs made by mk_attr_word and other variants#159277mu001999 wants to merge 1 commit into
Conversation
rustbot
added
S-waiting-on-author
mu001999
changed the title
tokens for attrs made by mk_attr_word and other variants
Contributor
|
r? me |
jdonszelmann
approved these changes
Jul 14, 2026
Contributor
There was a problem hiding this comment.
It's a big fix, but I think it actually addresses multiple longstanding issues. EIIs do the same, where they generate attributes, and I'm sure it was secretly vulnerable to the same ICE. Same for bench and global_allocator prolly too. I guess it's maybe even for the better we found out about this hehe, even though I guess I'm to blame for causing the regression.
Thanks @mu001999 !
r=me if you're ready @mu001999 , maybe undraft it, but I think this is a fine solution :3
| #[test_macros::identity_attr] | ||
| fn test() {} | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
I love that you test it with macro_attr, it's a much more concise test like this
Contributor
|
📋 Only open, non-draft PRs can be approved. |
rustbot
added
S-waiting-on-review
Member
Author
|
@bors r=jdonszelmann rollup |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Jul 14, 2026
…nszelmann Construct `tokens` for attrs made by `mk_attr_word` and other variants Fixes rust-lang#159261 `tokens` won't be constructed for generated built-in attrs before, so that after rust-lang#158854, `#[rustc_test_entrypoint_marker]` without `tokens` would be added when expanding `#[test]`. Then later expansions would cause the ICE when they wanna get the attr's `tokens`. This PR makes `tokens` constructed for such attrs, although this specific ICE only need editing `mk_attr_word`, but I think it would be good to also edit `mk_attr_nested_word` and `mk_attr_name_value_str`.
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Jul 14, 2026
…nszelmann Construct `tokens` for attrs made by `mk_attr_word` and other variants Fixes rust-lang#159261 `tokens` won't be constructed for generated built-in attrs before, so that after rust-lang#158854, `#[rustc_test_entrypoint_marker]` without `tokens` would be added when expanding `#[test]`. Then later expansions would cause the ICE when they wanna get the attr's `tokens`. This PR makes `tokens` constructed for such attrs, although this specific ICE only need editing `mk_attr_word`, but I think it would be good to also edit `mk_attr_nested_word` and `mk_attr_name_value_str`.
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Jul 14, 2026
…nszelmann Construct `tokens` for attrs made by `mk_attr_word` and other variants Fixes rust-lang#159261 `tokens` won't be constructed for generated built-in attrs before, so that after rust-lang#158854, `#[rustc_test_entrypoint_marker]` without `tokens` would be added when expanding `#[test]`. Then later expansions would cause the ICE when they wanna get the attr's `tokens`. This PR makes `tokens` constructed for such attrs, although this specific ICE only need editing `mk_attr_word`, but I think it would be good to also edit `mk_attr_nested_word` and `mk_attr_name_value_str`.
This was referenced Jul 14, 2026
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 14, 2026
…uwer Rollup of 22 pull requests Successful merges: - #156047 (Fix trait method resolution on an adjusted never type) - #157824 (Comptime inherent impls) - #158235 (Store `DefId` instead of `EiiDecl` in `EiiImplResolution::Known`) - #158723 (Support EII on Windows MSVC) - #158993 (rerun in original typing mode if we meet any opaques in post analysis) - #159160 (Make `HasTokens` a sub-trait of `HasAttrs`.) - #159183 (Introduce InstanceKind::LlvmIntrinsic) - #159251 (Bump rustc-perf submodule) - #155013 (Suggest the `[const] Destruct` bound for type parameters in const functions when missing) - #159155 (unstable book: Document `diagnostic_on_unknown` feature) - #159235 (Add regression test for #95719) - #159243 (inline Once wait and wait_force) - #159255 (Replace shortened type with `_` instead of `...` as placeholder) - #159259 (Add regression test for #144033) - #159265 (bootstrap: skip intrinsic-test when rustfmt is unavailable) - #159269 (disable range-len-try-from.rs on s390x) - #159272 (slice: make swap delegate to swap_unchecked) - #159274 (bootstrap: Rename `std_crates_for_run_make` to `std_crates_for_make_run`) - #159275 (remove obsolete comment) - #159277 (Construct `tokens` for attrs made by `mk_attr_word` and other variants) - #159283 (Remove obsolete verbose flag from deref/ref suggestions) - #159290 (rustc-dev-guide subtree update)
wjones127
pushed a commit
to lance-format/lance
that referenced
this pull request
Jul 14, 2026
Fixes #7786. Rust `nightly-2026-07-14` introduced rust-lang/rust#159261, which makes `linux-build` deterministically ICE while expanding a `#[test]` followed by an attribute macro. Lance hits this in the `lance-encoding` test binary before any tests execute, and the same failure is present on `main`. Pin the job's toolchain installation and `cargo llvm-cov` invocation to the last known-good `nightly-2026-07-13`. This is a temporary CI mitigation; restore the floating nightly after a dated release containing rust-lang/rust#159277 passes the reproduction and the full job.
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 15, 2026
…uwer Rollup of 22 pull requests Successful merges: - #156047 (Fix trait method resolution on an adjusted never type) - #157824 (Comptime inherent impls) - #158235 (Store `DefId` instead of `EiiDecl` in `EiiImplResolution::Known`) - #158723 (Support EII on Windows MSVC) - #158993 (rerun in original typing mode if we meet any opaques in post analysis) - #159160 (Make `HasTokens` a sub-trait of `HasAttrs`.) - #159183 (Introduce InstanceKind::LlvmIntrinsic) - #159251 (Bump rustc-perf submodule) - #155013 (Suggest the `[const] Destruct` bound for type parameters in const functions when missing) - #159155 (unstable book: Document `diagnostic_on_unknown` feature) - #159235 (Add regression test for #95719) - #159243 (inline Once wait and wait_force) - #159255 (Replace shortened type with `_` instead of `...` as placeholder) - #159259 (Add regression test for #144033) - #159265 (bootstrap: skip intrinsic-test when rustfmt is unavailable) - #159269 (disable range-len-try-from.rs on s390x) - #159272 (slice: make swap delegate to swap_unchecked) - #159274 (bootstrap: Rename `std_crates_for_run_make` to `std_crates_for_make_run`) - #159275 (remove obsolete comment) - #159277 (Construct `tokens` for attrs made by `mk_attr_word` and other variants) - #159283 (Remove obsolete verbose flag from deref/ref suggestions) - #159290 (rustc-dev-guide subtree update)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #159261
tokenswon't be constructed for generated built-in attrs before, so that after #158854,#[rustc_test_entrypoint_marker]withouttokenswould be added when expanding#[test]. Then later expansions would cause the ICE when they wanna get the attr'stokens.This PR makes
tokensconstructed for such attrs, although this specific ICE only need editingmk_attr_word, but I think it would be good to also editmk_attr_nested_wordandmk_attr_name_value_str.