Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

restrict promotion of const fn calls #121557

Merged
merged 5 commits into from
Apr 24, 2024
Merged

restrict promotion of const fn calls #121557

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift click to select a range
7183fa0
promotion: do not promote const-fn calls in const when that may fail …
RalfJung Feb 24, 2024
b2b617a
compute required_consts before promotion, and add promoteds that may …
RalfJung Mar 12, 2024
bf021ea
interpret: sanity-check that required_consts captures all consts that…
RalfJung Mar 14, 2024
173d1bd
properly fill a promoted's required_consts
RalfJung Mar 21, 2024
8436045
filter required_consts during inlining
RalfJung Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
filter required_consts during inlining
  • Loading branch information
@RalfJung
RalfJung committed Apr 23, 2024
commit 8436045e246c9a0b6d04e5e6ac8797055b20121b
5 changes: 2 additions & 3 deletions compiler/rustc_middle/src/mir/consts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 245,10 @@ impl<'tcx> Const<'tcx> {
match self {
Const::Ty(c) => match c.kind() {
ty::ConstKind::Value(_) => false, // already a value, cannot error
ty::ConstKind::Param(_) | ty::ConstKind::Error(_) => true, // these are errors or could be replaced by errors
_ => bug!("is_required_const: unexpected ty::ConstKind {:#?}", c),
_ => true,
},
Const::Unevaluated(..) => true,
Const::Val(..) => false, // already a value, cannot error
Const::Unevaluated(..) => true,
}
}

Expand Down
8 changes: 6 additions & 2 deletions compiler/rustc_mir_transform/src/inline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,8 720,12 @@ impl<'tcx> Inliner<'tcx> {
kind: TerminatorKind::Goto { target: integrator.map_block(START_BLOCK) },
});

// Copy required constants from the callee_body into the caller_body.
caller_body.required_consts.extend(callee_body.required_consts);
// Copy required constants from the callee_body into the caller_body. Although we are only
// pushing unevaluated consts to `required_consts`, here they may have been evaluated
// because we are calling `instantiate_and_normalize_erasing_regions` -- so we filter again.
caller_body.required_consts.extend(
callee_body.required_consts.into_iter().filter(|ct| ct.const_.is_required_const()),
);
// Now that we incorporated the callee's `required_consts`, we can remove the callee from
// `mentioned_items` -- but we have to take their `mentioned_items` in return. This does
// some extra work here to save the monomorphization collector work later. It helps a lot,
Expand Down
Loading