Skip to content

Commit 9314af9

Browse files
committed
Auto merge of #142220 - workingjubilee:rollup-idgfpof, r=workingjubilee
Rollup of 12 pull requests Successful merges: - rust-lang/rust#141803 (Remove rustc's notion of "preferred" alignment AKA `__alignof`) - rust-lang/rust#142053 (Add new Tier-3 targets: `loongarch32-unknown-none*`) - rust-lang/rust#142089 (Replace all uses of sysroot_candidates with get_or_default_sysroot) - rust-lang/rust#142108 (compiler: Add track_caller to AbiMapping::unwrap) - rust-lang/rust#142132 (`tests/ui`: A New Order [6/N]) - rust-lang/rust#142162 (UnsafePinned: update get() docs and signature to allow shared mutation) - rust-lang/rust#142171 (`tests/ui`: A New Order [7/N]) - rust-lang/rust#142179 (store `target.min_global_align` as an `Align`) - rust-lang/rust#142183 (Added test for 30904) - rust-lang/rust#142194 (Remove all unused feature gates from the compiler) - rust-lang/rust#142199 (Do not free disk space in the `mingw-check-tidy` job) - rust-lang/rust#142210 (Run `mingw-check-tidy` on auto builds) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b440ded + 04857c8 commit 9314af9

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/shims/alloc.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
1313
// alignment requirement and size less than or equal to the size requested."
1414
// So first we need to figure out what the limits are for "fundamental alignment".
1515
// This is given by `alignof(max_align_t)`. The following list is taken from
16-
// `library/std/src/sys/pal/common/alloc.rs` (where this is called `MIN_ALIGN`) and should
16+
// `library/std/src/sys/alloc/mod.rs` (where this is called `MIN_ALIGN`) and should
1717
// be kept in sync.
1818
let max_fundamental_align = match this.tcx.sess.target.arch.as_ref() {
19-
"x86" | "arm" | "mips" | "mips32r6" | "powerpc" | "powerpc64" | "wasm32" => 8,
19+
"x86" | "arm" | "loongarch32" | "mips" | "mips32r6" | "powerpc" | "powerpc64"
20+
| "wasm32" => 8,
2021
"x86_64" | "aarch64" | "mips64" | "mips64r6" | "s390x" | "sparc64" | "loongarch64" =>
2122
16,
2223
arch => bug!("unsupported target architecture for malloc: `{}`", arch),

0 commit comments

Comments
 (0)