Various cleanups around the const eval query providers by oli-obk · Pull Request #122397 · rust-lang/rust

oli-obk · 2024-03-12T17:37:09Z

r? @RalfJung

after this, working on running validation before interning starts with swapping the order of two lines of code

rustbot · 2024-03-12T17:37:20Z

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

RalfJung

Thanks, looks good!

Some nits and then I saw some chances for further cleanup. Feel free to disregard the latter if you don't want to expand the scope of this PR.

compiler/rustc_const_eval/src/const_eval/eval_queries.rs

oli-obk · 2024-03-13T09:30:50Z

@bors r=RalfJung

bors · 2024-03-13T09:30:52Z

📌 Commit a3fa705 has been approved by RalfJung

It is now in the queue for this repository.

compiler/rustc_const_eval/src/errors.rs

oli-obk · 2024-03-13T12:42:25Z

@bors r-

oli-obk · 2024-03-13T12:43:51Z

@bors r=RalfJung rollup

bors · 2024-03-13T12:43:54Z

📌 Commit 3393227 has been approved by RalfJung

It is now in the queue for this repository.

…Jung Various cleanups around the const eval query providers r? `@RalfJung` after this, working on running validation before interning starts with swapping the order of two lines of code

…iaskrgr Rollup of 12 pull requests Successful merges: - rust-lang#104353 (Add CStr::bytes iterator) - rust-lang#120699 (Document `TRACK_DIAGNOSTIC` calls.) - rust-lang#121207 (Add `-Z external-clangrt`) - rust-lang#122397 (Various cleanups around the const eval query providers) - rust-lang#122416 (Various style improvements to `rustc_lint::levels`) - rust-lang#122422 (compiletest: Allow `only-unix` in test headers) - rust-lang#122424 (fix: typos) - rust-lang#122425 (Increase timeout for new bors bot) - rust-lang#122426 (Fix StableMIR `WrappingRange::is_full` computation) - rust-lang#122430 (Generate link to `Local` in `hir::Let` documentation) - rust-lang#122434 (pattern analysis: rename a few types) - rust-lang#122437 (pattern analysis: remove `MaybeInfiniteInt::JustAfterMax`) r? `@ghost` `@rustbot` modify labels: rollup

…Jung Various cleanups around the const eval query providers r? ``@RalfJung`` after this, working on running validation before interning starts with swapping the order of two lines of code

…Jung Various cleanups around the const eval query providers r? ```@RalfJung``` after this, working on running validation before interning starts with swapping the order of two lines of code

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#104353 (Add CStr::bytes iterator) - rust-lang#120699 (Document `TRACK_DIAGNOSTIC` calls.) - rust-lang#120943 (Create some minimal HIR for associated opaque types) - rust-lang#121764 (Make incremental sessions identity no longer depend on the crate names provided by source code) - rust-lang#122375 (CFI: Break tests into smaller files) - rust-lang#122397 (Various cleanups around the const eval query providers) - rust-lang#122405 (Add methods to create StableMIR constant) - rust-lang#122416 (Various style improvements to `rustc_lint::levels`) - rust-lang#122440 (const-eval: organize and extend tests for required-consts) r? `@ghost` `@rustbot` modify labels: rollup

…Jung Various cleanups around the const eval query providers r? ````@RalfJung```` after this, working on running validation before interning starts with swapping the order of two lines of code

bors · 2024-03-14T10:53:16Z

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

…ine it

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#104353 (Add CStr::bytes iterator) - rust-lang#119676 (rustdoc-search: search types by higher-order functions) - rust-lang#120699 (Document `TRACK_DIAGNOSTIC` calls.) - rust-lang#121899 (Document how removing a type's field can be bad and what to do instead) - rust-lang#122405 (Add methods to create StableMIR constant) - rust-lang#122416 (Various style improvements to `rustc_lint::levels`) - rust-lang#122421 (Improve `Step` docs) - rust-lang#122440 (const-eval: organize and extend tests for required-consts) - rust-lang#122461 (fix unsoundness in Step::forward_unchecked for signed integers) Failed merges: - rust-lang#122397 (Various cleanups around the const eval query providers) r? `@ghost` `@rustbot` modify labels: rollup

…g to know the `Machine` type

…t is in fact about validation failures

oli-obk · 2024-03-14T12:22:00Z

@bors r=RalfJung

bors · 2024-03-14T12:22:04Z

📌 Commit a316c21 has been approved by RalfJung

It is now in the queue for this repository.

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#119029 (Avoid closing invalid handles) - rust-lang#122238 (Document some builtin impls in the next solver) - rust-lang#122247 (rustdoc-search: depth limit `T<U>` -> `U` unboxing) - rust-lang#122287 (add test ensuring simd codegen checks don't run when a static assertion failed) - rust-lang#122368 (chore: remove repetitive words) - rust-lang#122397 (Various cleanups around the const eval query providers) - rust-lang#122406 (Fix WF for `AsyncFnKindHelper` in new trait solver) - rust-lang#122477 (Change some attribute to only_local) - rust-lang#122482 (Ungate the `UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES` lint) - rust-lang#122490 (Update build instructions for OpenHarmony) Failed merges: - rust-lang#122471 (preserve span when evaluating mir::ConstOperand) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#122397 - oli-obk:machine-read-hook2, r=RalfJung Various cleanups around the const eval query providers r? `@RalfJung` after this, working on running validation before interning starts with swapping the order of two lines of code

…=<try> Validate before interning based on rust-lang#122397 fixes rust-lang#122398 r? `@RalfJung` There are more cleanups that can be done afterwards, but I think they may be unnecessary to make this PR useful on its own

rustbot assigned RalfJung Mar 12, 2024

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 Mar 12, 2024

RalfJung reviewed Mar 12, 2024

View reviewed changes

oli-obk mentioned this pull request Mar 13, 2024

Ensure nested allocations in statics neither get deduplicated nor duplicated #121644

Merged

oli-obk force-pushed the machine-read-hook2 branch from bd64048 to a3fa705 Compare March 13, 2024 09:30

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 Mar 13, 2024

RalfJung reviewed Mar 13, 2024

View reviewed changes

compiler/rustc_const_eval/src/errors.rs Outdated Show resolved Hide resolved

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 13, 2024

oli-obk force-pushed the machine-read-hook2 branch from a3fa705 to 3393227 Compare March 13, 2024 12:43

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 Mar 13, 2024

oli-obk mentioned this pull request Mar 13, 2024

Validate before interning #122432

Closed

matthiaskrgr mentioned this pull request Mar 13, 2024

Rollup of 12 pull requests #122444

Closed

matthiaskrgr mentioned this pull request Mar 13, 2024

Rollup of 10 pull requests #122453

Closed

matthiaskrgr mentioned this pull request Mar 13, 2024

Rollup of 9 pull requests #122457

Closed

This was referenced Mar 14, 2024

Rollup of 10 pull requests #122474

Closed

Rollup of 9 pull requests #122483

Merged

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 14, 2024

oli-obk added 5 commits March 14, 2024 11:39

Fix accidental re-addition of removed code in a previous PR

71f1943

Generalize eval_in_interpreter with a helper trait

d6c9997

Move only usage of take_static_root_alloc to its definition and inl…

93888cd

…ine it

Move error handling into const_validate_mplace

8b8efd1

Move InterpCx into eval_in_interpreter

6b936b6

oli-obk added 7 commits March 14, 2024 12:20

Move generate_stacktrace_from_stack away from InterpCx to avoid havin…

d2d2bd2

…g to know the `Machine` type

Directly pass in the stack instead of computing it from a machine

d3b7b55

Remove an argument that can be computed cheaply

02a0ac8

Share the InterpCx creation between static and const evaluation

cc7e0b2

Move validation into eval_body_using_ecx

2e6c490

Move the entire success path into eval_body_using_ecx

16046c7

Rename some things around validation error reporting to signal that i…

a316c21

…t is in fact about validation failures

oli-obk force-pushed the machine-read-hook2 branch from 3393227 to a316c21 Compare March 14, 2024 12:21

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 Mar 14, 2024

matthiaskrgr mentioned this pull request Mar 14, 2024

Rollup of 10 pull requests #122497

Merged

bors merged commit b4dffc9 into rust-lang:master Mar 14, 2024

rustbot added this to the 1.78.0 milestone Mar 14, 2024

oli-obk deleted the machine-read-hook2 branch March 14, 2024 21:20

Uh oh!

Conversation

oli-obk commented Mar 12, 2024

Uh oh!

rustbot commented Mar 12, 2024

Uh oh!

RalfJung left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

oli-obk commented Mar 13, 2024

Uh oh!

bors commented Mar 13, 2024

Uh oh!

Uh oh!

oli-obk commented Mar 13, 2024

Uh oh!

oli-obk commented Mar 13, 2024

Uh oh!

bors commented Mar 13, 2024

Uh oh!

bors commented Mar 14, 2024

Uh oh!

oli-obk commented Mar 14, 2024

Uh oh!

bors commented Mar 14, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants