fix ICE when promoted has layout size overflow #133704
Merged
Conversation
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
rustbot
added
S-waiting-on-review
|
Some changes occurred to the CTFE / Miri interpreter cc @rust-lang/miri Some changes occurred to the CTFE / Miri interpreter cc @rust-lang/miri, @rust-lang/wg-const-eval Some changes occurred to the CTFE machinery cc @rust-lang/wg-const-eval |
This comment has been minimized.
This comment has been minimized.
RalfJung
force-pushed
the
promoted-size-overflow-ice
branch
from
87014f0 to
20142d3
Compare
compiler-errors
approved these changes
Dec 1, 2024
| } | ||
| // Report remaining errors. | ||
| _ => { | ||
| let (our_span, frames) = get_span_and_frames(); | ||
| let span = span.substitute_dummy(our_span); | ||
| let err = mk(span, frames); | ||
| let mut err = tcx.dcx().create_err(err); | ||
| let can_be_spurious = matches!(error, InterpErrorKind::ResourceExhaustion(_)); | ||
| // We allow invalid programs in infallible promoteds since invalid layouts can occur | ||
| // anyway (e.g. due to size overflow). And we allow OOM as that can happy any time. |
There was a problem hiding this comment.
Suggested change
| // anyway (e.g. due to size overflow). And we allow OOM as that can happy any time. | |
| // anyway (e.g. due to size overflow). And we allow OOM as that can happen any time. |
RalfJung
force-pushed
the
promoted-size-overflow-ice
branch
from
20142d3 to
a17294d
Compare
|
@bors r=compiler-errors |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 3, 2024
…llaumeGomez Rollup of 10 pull requests Successful merges: - rust-lang#131713 (Stabilize `const_maybe_uninit_write`) - rust-lang#133535 (show forbidden_lint_groups in future-compat reports) - rust-lang#133610 (Move `Const::{from_anon_const,try_from_lit}` to hir_ty_lowering) - rust-lang#133701 (Use c"lit" for CStrings without unwrap) - rust-lang#133704 (fix ICE when promoted has layout size overflow) - rust-lang#133705 (add "profiler" and "optimized-compiler-builtins" option coverage for ci-rustc) - rust-lang#133710 (Reducing `target_feature` check-cfg merge conflicts) - rust-lang#133732 (Fix `-Zdump-mir-dataflow`) - rust-lang#133746 (Change `AttrArgs::Eq` to a struct variant) - rust-lang#133763 (Fix `f16::midpoint` const feature gate) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 3, 2024
Rollup merge of rust-lang#133704 - RalfJung:promoted-size-overflow-ice, r=compiler-errors fix ICE when promoted has layout size overflow Turns out there is no reason to distinguish `tainted_by_errors` and `can_be_spurious` here, we can just track whether we allow this even in "infallible" constants. Fixes rust-lang#125476
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
Turns out there is no reason to distinguish
tainted_by_errorsandcan_be_spurioushere, we can just track whether we allow this even in "infallible" constants.Fixes #125476