Skip to content

Commit 9a007c9

Browse files
committed
Auto merge of #143116 - matthiaskrgr:rollup-zy9ez06, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang/rust#139858 (New const traits syntax) - rust-lang/rust#140809 (Reduce special casing for the panic runtime) - rust-lang/rust#142730 (suggest declaring modules when file found but module not defined) - rust-lang/rust#142806 (Normalize before computing ConstArgHasType goal in new solver) - rust-lang/rust#143046 (const validation: properly ignore zero-sized UnsafeCell) - rust-lang/rust#143092 (const checks for lifetime-extended temporaries: avoid 'top-level scope' terminology) - rust-lang/rust#143096 (tag_for_variant: properly pass TypingEnv) - rust-lang/rust#143104 (hir_analysis: prohibit `dyn PointeeSized`) - rust-lang/rust#143106 (gce: don't ICE on non-local const) Failed merges: - rust-lang/rust#143036 (Remove support for `dyn*` from the compiler) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3bfa5ee + c44abce commit 9a007c9

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

cargo-miri/src/setup.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ pub fn setup(
8383
SysrootConfig::NoStd
8484
} else {
8585
SysrootConfig::WithStd {
86-
std_features: ["panic_unwind", "backtrace"].into_iter().map(Into::into).collect(),
86+
std_features: ["panic-unwind", "backtrace"].into_iter().map(Into::into).collect(),
8787
}
8888
};
8989
let cargo_cmd = {

src/bin/miri.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ impl rustc_driver::Callbacks for MiriBeRustCompilerCalls {
295295
level: SymbolExportLevel::C,
296296
kind: SymbolExportKind::Text,
297297
used: false,
298+
rustc_std_internal_symbol: false,
298299
},
299300
))
300301
} else {

src/borrow_tracker/stacked_borrows/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ trait EvalContextPrivExt<'tcx, 'ecx>: crate::MiriInterpCxExt<'tcx> {
814814
info: RetagInfo, // diagnostics info about this retag
815815
) -> InterpResult<'tcx, MPlaceTy<'tcx>> {
816816
let this = self.eval_context_mut();
817-
let size = this.size_and_align_of_mplace(place)?.map(|(size, _)| size);
817+
let size = this.size_and_align_of_val(place)?.map(|(size, _)| size);
818818
// FIXME: If we cannot determine the size (because the unsized tail is an `extern type`),
819819
// bail out -- we cannot reasonably figure out which memory range to reborrow.
820820
// See https://github.com/rust-lang/unsafe-code-guidelines/issues/276.

src/borrow_tracker/tree_borrows/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ trait EvalContextPrivExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
469469
// - if the pointer is not reborrowed (raw pointer) then we override the size
470470
// to do a zero-length reborrow.
471471
let reborrow_size = this
472-
.size_and_align_of_mplace(place)?
472+
.size_and_align_of_val(place)?
473473
.map(|(size, _)| size)
474474
.unwrap_or(place.layout.size);
475475
trace!("Creating new permission: {:?} with size {:?}", new_perm, reborrow_size);

src/helpers.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
489489
trace!("visit_frozen(place={:?}, size={:?})", *place, size);
490490
debug_assert_eq!(
491491
size,
492-
this.size_and_align_of_mplace(place)?
492+
this.size_and_align_of_val(place)?
493493
.map(|(size, _)| size)
494494
.unwrap_or_else(|| place.layout.size)
495495
);
@@ -530,7 +530,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
530530
trace!("unsafe_cell_action on {:?}", place.ptr());
531531
// We need a size to go on.
532532
let unsafe_cell_size = this
533-
.size_and_align_of_mplace(place)?
533+
.size_and_align_of_val(place)?
534534
.map(|(size, _)| size)
535535
// for extern types, just cover what we can
536536
.unwrap_or_else(|| place.layout.size);

0 commit comments

Comments
 (0)