Report the actual item that evaluation failed for #142015

oli-obk · 2025-06-04T08:14:29Z

instead of id of the last frame in the evaluation stack

r? @RalfJung

fixes #142010

rustbot · 2025-06-04T08:14:36Z

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

RalfJung · 2025-06-04T09:08:15Z

Oh wow... good find!

Can you add a test for this that has //~NOTE annotations ensuring this does not regress?

compiler/rustc_const_eval/src/const_eval/eval_queries.rs

RalfJung · 2025-06-04T09:10:01Z

This would affect even automatically derived diagnostic types, wouldn't it? That's a pretty severe bug in the diagnostic infrastructure -- fields of separate diagnostic types shouldn't be mixed like that. Can you file an issue and reference it from the comment here?

oli-obk · 2025-06-04T15:14:09Z

Can you add a test for this that has //~NOTE annotations ensuring this does not regress?

done

RalfJung · 2025-06-04T15:16:42Z

r=me when CI is green

oli-obk · 2025-06-05T07:50:04Z

@bors r=RalfJung

bors · 2025-06-05T07:50:06Z

📌 Commit 6417248 has been approved by RalfJung

It is now in the queue for this repository.

Report the actual item that evaluation failed for instead of id of the last frame in the evaluation stack r? `@RalfJung` fixes rust-lang#142010

Rollup of 7 pull requests Successful merges: - #141709 (jsondocck: Refactor directive handling) - #141974 (`tests/ui`: A New Order [4/N]) - #141989 (rustdoc-json-type: Depend on `serde` and `serde_derive` seperately) - #142015 (Report the actual item that evaluation failed for) - #142026 (bootstrap: Fix file permissions when dereferencing symlinks) - #142032 (Fix parsing of frontmatters with inner hyphens) - #142036 (Update the `compiler-builtins` subtree) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #142015 - oli-obk:wrong-instance, r=RalfJung Report the actual item that evaluation failed for instead of id of the last frame in the evaluation stack r? ``@RalfJung`` fixes #142010

Rollup of 7 pull requests Successful merges: - rust-lang/rust#141709 (jsondocck: Refactor directive handling) - rust-lang/rust#141974 (`tests/ui`: A New Order [4/N]) - rust-lang/rust#141989 (rustdoc-json-type: Depend on `serde` and `serde_derive` seperately) - rust-lang/rust#142015 (Report the actual item that evaluation failed for) - rust-lang/rust#142026 (bootstrap: Fix file permissions when dereferencing symlinks) - rust-lang/rust#142032 (Fix parsing of frontmatters with inner hyphens) - rust-lang/rust#142036 (Update the `compiler-builtins` subtree) r? `@ghost` `@rustbot` modify labels: rollup

Culprit PRs: - June 4: rust-lang/rust#141741 - June 5: rust-lang/rust#142015 - June 6: rust-lang/rust#138677, rust-lang/rust#142005 - June 7: rust-lang/rust#142012 - June 9: rust-lang/rust#141700 - June 10: rust-lang/rust#142179, rust-lang/rust#141803 Resolves #4140 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#141709 (jsondocck: Refactor directive handling) - rust-lang#141974 (`tests/ui`: A New Order [4/N]) - rust-lang#141989 (rustdoc-json-type: Depend on `serde` and `serde_derive` seperately) - rust-lang#142015 (Report the actual item that evaluation failed for) - rust-lang#142026 (bootstrap: Fix file permissions when dereferencing symlinks) - rust-lang#142032 (Fix parsing of frontmatters with inner hyphens) - rust-lang#142036 (Update the `compiler-builtins` subtree) r? `@ghost` `@rustbot` modify labels: rollup

…li-obk Add runtime check to avoid overwrite arg in `Diag` ## Origin PR description At first, I set up a `debug_assert` check for the arg method to make sure that `args` in `Diag` aren't easily overwritten, and I added the `remove_arg()` method, so that if you do need to overwrite an arg, then you can explicitly call `remove_arg()` to remove it first, then call `arg()` to overwrite it. For the code before the rust-lang#142015 change, it won't compile because it will report an error ``` arg `instance`already exists. ``` This PR also modifies all diagnostics that fail the check to pass the check. There are two cases of check failure: 1. ~~Between *the parent diagnostic and the subdiagnostic*, or *between the subdiagnostics* have the same field between them. In this case, I renamed the conflicting fields.~~ 2. ~~For subdiagnostics stored in `Vec`, the rendering may iteratively write the same arg over and over again. In this case, I changed the auto-generation with `derive(SubDiagnostic)` to manually implementing `SubDiagnostic` and manually rendered it with `eagerly_translate()`, similar to rust-lang#142031 (comment), and after rendering it I manually deleted useless arg with the newly added `remove_arg` method.~~ ## Final Decision After trying and discussing, we made a final decision. For `#[derive(Subdiagnostic)]`, This PR made two changes: 1. After the subdiagnostic is rendered, remove all args of this subdiagnostic, which allows for usage like `Vec<Subdiag>`. 2. Store `diag.args` before setting arguments, so that you can restore the contents of the main diagnostic after deleting the arguments after subdiagnostic is rendered, to avoid deleting the main diagnostic's arg when they have the same name args.

Rollup merge of #142724 - xizheyin:avoid_overwrite_args, r=oli-obk Add runtime check to avoid overwrite arg in `Diag` ## Origin PR description At first, I set up a `debug_assert` check for the arg method to make sure that `args` in `Diag` aren't easily overwritten, and I added the `remove_arg()` method, so that if you do need to overwrite an arg, then you can explicitly call `remove_arg()` to remove it first, then call `arg()` to overwrite it. For the code before the #142015 change, it won't compile because it will report an error ``` arg `instance`already exists. ``` This PR also modifies all diagnostics that fail the check to pass the check. There are two cases of check failure: 1. ~~Between *the parent diagnostic and the subdiagnostic*, or *between the subdiagnostics* have the same field between them. In this case, I renamed the conflicting fields.~~ 2. ~~For subdiagnostics stored in `Vec`, the rendering may iteratively write the same arg over and over again. In this case, I changed the auto-generation with `derive(SubDiagnostic)` to manually implementing `SubDiagnostic` and manually rendered it with `eagerly_translate()`, similar to #142031 (comment), and after rendering it I manually deleted useless arg with the newly added `remove_arg` method.~~ ## Final Decision After trying and discussing, we made a final decision. For `#[derive(Subdiagnostic)]`, This PR made two changes: 1. After the subdiagnostic is rendered, remove all args of this subdiagnostic, which allows for usage like `Vec<Subdiag>`. 2. Store `diag.args` before setting arguments, so that you can restore the contents of the main diagnostic after deleting the arguments after subdiagnostic is rendered, to avoid deleting the main diagnostic's arg when they have the same name args.

Add runtime check to avoid overwrite arg in `Diag` ## Origin PR description At first, I set up a `debug_assert` check for the arg method to make sure that `args` in `Diag` aren't easily overwritten, and I added the `remove_arg()` method, so that if you do need to overwrite an arg, then you can explicitly call `remove_arg()` to remove it first, then call `arg()` to overwrite it. For the code before the rust-lang/rust#142015 change, it won't compile because it will report an error ``` arg `instance`already exists. ``` This PR also modifies all diagnostics that fail the check to pass the check. There are two cases of check failure: 1. ~~Between *the parent diagnostic and the subdiagnostic*, or *between the subdiagnostics* have the same field between them. In this case, I renamed the conflicting fields.~~ 2. ~~For subdiagnostics stored in `Vec`, the rendering may iteratively write the same arg over and over again. In this case, I changed the auto-generation with `derive(SubDiagnostic)` to manually implementing `SubDiagnostic` and manually rendered it with `eagerly_translate()`, similar to rust-lang/rust#142031 (comment), and after rendering it I manually deleted useless arg with the newly added `remove_arg` method.~~ ## Final Decision After trying and discussing, we made a final decision. For `#[derive(Subdiagnostic)]`, This PR made two changes: 1. After the subdiagnostic is rendered, remove all args of this subdiagnostic, which allows for usage like `Vec<Subdiag>`. 2. Store `diag.args` before setting arguments, so that you can restore the contents of the main diagnostic after deleting the arguments after subdiagnostic is rendered, to avoid deleting the main diagnostic's arg when they have the same name args.

rustbot assigned RalfJung Jun 4, 2025

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 4, 2025

RalfJung reviewed Jun 4, 2025

View reviewed changes

compiler/rustc_const_eval/src/const_eval/eval_queries.rs Show resolved Hide resolved

RalfJung mentioned this pull request Jun 4, 2025

const-eval error: always say in which item the error occurred #142008

Merged

oli-obk force-pushed the wrong-instance branch from 2798cf8 to c687b41 Compare June 4, 2025 15:12

Report the actual item that evaluation failed for

6417248

oli-obk force-pushed the wrong-instance branch from c687b41 to 6417248 Compare June 4, 2025 15:13

oli-obk mentioned this pull request Jun 4, 2025

fluent diagnostics can easily overwrite each others' fields/args #142031

Open

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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 5, 2025

This was referenced Jun 5, 2025

Rollup of 8 pull requests #142080

Closed

Rollup of 7 pull requests #142081

Merged

bors merged commit 0820dd0 into rust-lang:master Jun 5, 2025
10 checks passed

rustbot added this to the 1.89.0 milestone Jun 5, 2025

carolynzech mentioned this pull request Jun 13, 2025

Update toolchain to 2025-06-13 model-checking/kani#4152

Merged

xizheyin mentioned this pull request Jun 19, 2025

Add runtime check to avoid overwrite arg in Diag #142724

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Report the actual item that evaluation failed for #142015

Report the actual item that evaluation failed for #142015

Uh oh!

oli-obk commented Jun 4, 2025 •

edited by rustbot

Loading

Uh oh!

rustbot commented Jun 4, 2025

Uh oh!

RalfJung commented Jun 4, 2025

Uh oh!

Uh oh!

RalfJung commented Jun 4, 2025

Uh oh!

oli-obk commented Jun 4, 2025

Uh oh!

RalfJung commented Jun 4, 2025

Uh oh!

oli-obk commented Jun 5, 2025

Uh oh!

bors commented Jun 5, 2025

Uh oh!

Uh oh!

Uh oh!

Report the actual item that evaluation failed for #142015

Report the actual item that evaluation failed for #142015

Uh oh!

Conversation

oli-obk commented Jun 4, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 4, 2025

Uh oh!

RalfJung commented Jun 4, 2025

Uh oh!

Uh oh!

RalfJung commented Jun 4, 2025

Uh oh!

oli-obk commented Jun 4, 2025

Uh oh!

RalfJung commented Jun 4, 2025

Uh oh!

oli-obk commented Jun 5, 2025

Uh oh!

bors commented Jun 5, 2025

Uh oh!

Uh oh!

Uh oh!

oli-obk commented Jun 4, 2025 •

edited by rustbot

Loading