Skip to content

Trace ?id.local_def_index instead of id in def_path_hash#157241

Open
aerooneqq wants to merge 1 commit into
rust-lang:mainfrom
aerooneqq:def-path-hash-instrumentation-fix
Open

Trace ?id.local_def_index instead of id in def_path_hash#157241
aerooneqq wants to merge 1 commit into
rust-lang:mainfrom
aerooneqq:def-path-hash-instrumentation-fix

Conversation

@aerooneqq
Copy link
Copy Markdown
Contributor

@aerooneqq aerooneqq commented Jun 1, 2026 •
edited by rustbot
Loading

Trace local_def_index instead of LocalDefId in def_path_hash, as latter causes errors (previous version of this function accepted DefIndex).

Fixes #157238.
r? @petrochenkov

@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 Jun 1, 2026
aerooneqq
aerooneqq commented Jun 1, 2026
View reviewed changes
Comment thread tests/ui/rustc-env/def-path-hash-ice-157238.rs
@aerooneqq aerooneqq force-pushed the def-path-hash-instrumentation-fix branch from ca5c357 to 6bfd704 Compare June 1, 2026 09:50
@rust-log-analyzer

This comment has been minimized.

Sign in to view
petrochenkov
petrochenkov reviewed Jun 1, 2026
View reviewed changes
Comment thread compiler/rustc_hir/src/definitions.rs Outdated
@petrochenkov
Copy link
Copy Markdown
Contributor

petrochenkov commented Jun 1, 2026

r=me after addressing the comments and squashing commits.
@rustbot author

@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 1, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Jun 1, 2026

Error: shortcut handler unexpectedly failed in this comment: error sending request

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #triagebot on Zulip.

@petrochenkov petrochenkov added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 1, 2026
@aerooneqq aerooneqq force-pushed the def-path-hash-instrumentation-fix branch from 6bfd704 to 6fac60d Compare June 1, 2026 11:47
@aerooneqq
Copy link
Copy Markdown
Contributor Author

aerooneqq commented Jun 1, 2026

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 1, 2026
@petrochenkov
Copy link
Copy Markdown
Contributor

petrochenkov commented Jun 1, 2026

@bors r+ rollup

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Jun 1, 2026

📌 Commit 6fac60d has been approved by petrochenkov

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 1, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 1, 2026
@JonathanBrouwer
Rollup merge of rust-lang#157241 - aerooneqq:def-path-hash-instrument…
e08b2f9 
…ation-fix, r=petrochenkov

Trace `?id.local_def_index` instead of `id` in `def_path_hash`

Trace `local_def_index` instead of `LocalDefId` in `def_path_hash`, as latter causes errors (previous version of this function accepted `DefIndex`).

Fixes rust-lang#157238.
r? @petrochenkov
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jun 1, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 1, 2026
@JonathanBrouwer
Rollup merge of rust-lang#157241 - aerooneqq:def-path-hash-instrument…
955801c 
…ation-fix, r=petrochenkov

Trace `?id.local_def_index` instead of `id` in `def_path_hash`

Trace `local_def_index` instead of `LocalDefId` in `def_path_hash`, as latter causes errors (previous version of this function accepted `DefIndex`).

Fixes rust-lang#157238.
r? @petrochenkov
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jun 1, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 1, 2026
@JonathanBrouwer
Rollup merge of rust-lang#157241 - aerooneqq:def-path-hash-instrument…
3dc2e90 
…ation-fix, r=petrochenkov

Trace `?id.local_def_index` instead of `id` in `def_path_hash`

Trace `local_def_index` instead of `LocalDefId` in `def_path_hash`, as latter causes errors (previous version of this function accepted `DefIndex`).

Fixes rust-lang#157238.
r? @petrochenkov
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jun 1, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 1, 2026
@JonathanBrouwer
Rollup merge of rust-lang#157241 - aerooneqq:def-path-hash-instrument…
3b101cb 
…ation-fix, r=petrochenkov

Trace `?id.local_def_index` instead of `id` in `def_path_hash`

Trace `local_def_index` instead of `LocalDefId` in `def_path_hash`, as latter causes errors (previous version of this function accepted `DefIndex`).

Fixes rust-lang#157238.
r? @petrochenkov
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jun 1, 2026
Open
rust-bors Bot pushed a commit that referenced this pull request Jun 1, 2026
@bors
Auto merge of #157266 - JonathanBrouwer:rollup-EIe7NPQ, r=JonathanBro…
6b84e61 
…uwer

Rollup of 13 pull requests

Successful merges:

 - #156085 (miri: require (almost) all 1-ZST arguments to be actually passed)
 - #155193 (Check arguments of attributes where no arguments are expected)
 - #156516 (nix: remove some unneeded variables)
 - #156562 (Resolving Windows environment test failures)
 - #156588 (Don't drop uninit memory when `MapWindows::clone` panics)
 - #156673 (Privacy: small cleanups)
 - #156817 (Add `#[unsafe_eii]` to unsafe EII UI tests)
 - #156924 (Use #[panic_handler] rather than #[lang = "panic_impl"])
 - #157055 (LLVM 23: Run AssignGUIDPass in some places)
 - #157108 (Add Xtensa va_arg assembly coverage)
 - #157220 (cg_ssa: a bit less `immediate_or_packed_pair`)
 - #157241 (Trace `?id.local_def_index` instead of `id` in `def_path_hash`)
 - #157242 (Tune backport Zulip messages)
rust-bors Bot pushed a commit that referenced this pull request Jun 1, 2026
@bors
Auto merge of #157266 - JonathanBrouwer:rollup-EIe7NPQ, r=JonathanBro…
ef18367 
…uwer

Rollup of 13 pull requests

Successful merges:

 - #156085 (miri: require (almost) all 1-ZST arguments to be actually passed)
 - #155193 (Check arguments of attributes where no arguments are expected)
 - #156516 (nix: remove some unneeded variables)
 - #156562 (Resolving Windows environment test failures)
 - #156588 (Don't drop uninit memory when `MapWindows::clone` panics)
 - #156673 (Privacy: small cleanups)
 - #156817 (Add `#[unsafe_eii]` to unsafe EII UI tests)
 - #156924 (Use #[panic_handler] rather than #[lang = "panic_impl"])
 - #157055 (LLVM 23: Run AssignGUIDPass in some places)
 - #157108 (Add Xtensa va_arg assembly coverage)
 - #157220 (cg_ssa: a bit less `immediate_or_packed_pair`)
 - #157241 (Trace `?id.local_def_index` instead of `id` in `def_path_hash`)
 - #157242 (Tune backport Zulip messages)
rust-bors Bot pushed a commit that referenced this pull request Jun 1, 2026
@bors
Auto merge of #157266 - JonathanBrouwer:rollup-EIe7NPQ, r=JonathanBro…
4a31759 
…uwer

Rollup of 13 pull requests

Successful merges:

 - #156085 (miri: require (almost) all 1-ZST arguments to be actually passed)
 - #155193 (Check arguments of attributes where no arguments are expected)
 - #156516 (nix: remove some unneeded variables)
 - #156562 (Resolving Windows environment test failures)
 - #156588 (Don't drop uninit memory when `MapWindows::clone` panics)
 - #156673 (Privacy: small cleanups)
 - #156817 (Add `#[unsafe_eii]` to unsafe EII UI tests)
 - #156924 (Use #[panic_handler] rather than #[lang = "panic_impl"])
 - #157055 (LLVM 23: Run AssignGUIDPass in some places)
 - #157108 (Add Xtensa va_arg assembly coverage)
 - #157220 (cg_ssa: a bit less `immediate_or_packed_pair`)
 - #157241 (Trace `?id.local_def_index` instead of `id` in `def_path_hash`)
 - #157242 (Tune backport Zulip messages)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

At least 1 approving review is required to merge this pull request.

Assignees

@petrochenkov petrochenkov

Labels

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[ICE]: RUSTC_LOG=trace broken on main

4 participants

@aerooneqq @rust-log-analyzer @petrochenkov @rustbot