interpret: do not call machine read hooks during validation #122249
Merged
Conversation
This file contains 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
rustbot
added
S-waiting-on-review
|
Some changes occurred to the CTFE / Miri engine cc @rust-lang/miri The Miri subtree was changed cc @rust-lang/miri |
RalfJung
force-pushed
the
machine-read-hook
branch
from
f72a115 to
c003fa5
Compare
RalfJung
commented
Mar 9, 2024
| // Temporarily allow access to the static_root_alloc_id for the purpose of validation. | ||
| let static_root_alloc_id = ecx.machine.static_root_alloc_id.take(); | ||
| let validation = const_validate_mplace(&ecx, &mplace, cid); | ||
| ecx.machine.static_root_alloc_id = static_root_alloc_id; |
There was a problem hiding this comment.
I am a bit torn about whether before_alloc_read should be suppressed during validation. OTOH it is nice that we can now remove this code here. On the other hand, now if validation does do a read from this static, it will see Uninit and show a surprising error rather than triggering a cycle error. I don't know if it is even possible to do that, it would require a copy_op_transmute from the static to somewhere else.
If validation passes, we'll still get the cycle error from the actual read part of copy_op.
RalfJung
commented
Mar 9, 2024
| @@ -0,0 +1,28 @@ | |||
| #![feature(start)] | |||
| #![no_std] | |||
| //@compile-flags: -Zmiri-track-alloc-id=17 -Zmiri-track-alloc-accesses -Cpanic=abort | |||
There was a problem hiding this comment.
As an isolated no_std test, I think the alloc IDs here should be fully stable.
There was a problem hiding this comment.
Damn, somehow it is different on macOS... I guess I'll have to add some only-target.
This comment has been minimized.
This comment has been minimized.
RalfJung
force-pushed
the
machine-read-hook
branch
from
c003fa5 to
bf47df8
Compare
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
RalfJung
commented
Mar 11, 2024
oli-obk
force-pushed
the
machine-read-hook
branch
from
3c4f73d to
bf47df8
Compare
|
@bors r+ I can explore my ideas in separate PRs |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 11, 2024
interpret: do not call machine read hooks during validation Fixes rust-lang/miri#3347 r? `@oli-obk`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 11, 2024
…kingjubilee Rollup of 15 pull requests Successful merges: - rust-lang#116791 (Allow codegen backends to opt-out of parallel codegen) - rust-lang#116793 (Allow targets to override default codegen backend) - rust-lang#117458 (LLVM Bitcode Linker: A self contained linker for nvptx and other targets) - rust-lang#119385 (Fix type resolution of associated const equality bounds (take 2)) - rust-lang#121438 (std support for wasm32 panic=unwind) - rust-lang#121893 (Add tests (and a bit of cleanup) for interior mut handling in promotion and const-checking) - rust-lang#122080 (Clarity improvements to `DropTree`) - rust-lang#122152 (Improve diagnostics for parenthesized type arguments) - rust-lang#122166 (Remove the unused `field_remapping` field from `TypeLowering`) - rust-lang#122249 (interpret: do not call machine read hooks during validation) - rust-lang#122299 (Store backtrace for `must_produce_diag`) - rust-lang#122318 (Revision-related tweaks for next-solver tests) - rust-lang#122320 (Use ptradd for vtable indexing) - rust-lang#122328 (unix_sigpipe: Replace `inherit` with `sig_dfl` in syntax tests) - rust-lang#122330 (bootstrap readme: fix, improve, update) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 11, 2024
Rollup merge of rust-lang#122249 - RalfJung:machine-read-hook, r=oli-obk interpret: do not call machine read hooks during validation Fixes rust-lang/miri#3347 r? ``@oli-obk``
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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 rust-lang/miri#3347
r? @oli-obk