Skip to content

Commit

Permalink
Auto merge of #3291 - rust-lang:rustup-2024-02-06, r=saethlin
Browse files Browse the repository at this point in the history
Automatic Rustup
  • Loading branch information
bors committed Feb 6, 2024
2 parents f033eb8 + b0edbf5 commit cf71352
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 3 deletions.
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
80deabd0987201e1b8d060400f50e03309a0105e
f3b9d47a46c6d237665801155aa3e26c5f49958b
2 changes: 1 addition & 1 deletion tests/pass/intrinsics-x86-aes-vaes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//@ignore-target-wasm32
//@compile-flags: -C target-feature=+aes,+vaes,+avx512f

#![feature(avx512_target_feature, stdsimd)]
#![feature(avx512_target_feature, stdarch_x86_avx512)]

use core::mem::transmute;
#[cfg(target_arch = "x86")]
Expand Down
2 changes: 1 addition & 1 deletion tests/pass/intrinsics-x86-avx512.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//@compile-flags: -C target-feature=+avx512f,+avx512vl,+avx512bitalg,+avx512vpopcntdq

#![feature(avx512_target_feature)]
#![feature(stdsimd)]
#![feature(stdarch_x86_avx512)]

#[cfg(target_arch = "x86")]
use std::arch::x86::*;
Expand Down
20 changes: 20 additions & 0 deletions tests/pass/issues/issue-miri-3282-struct-tail-normalize.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// regression test for an ICE: https://github.com/rust-lang/miri/issues/3282

trait Id {
type Assoc: ?Sized;
}

impl<T: ?Sized> Id for T {
type Assoc = T;
}

#[repr(transparent)]
struct Foo<T: ?Sized> {
field: <T as Id>::Assoc,
}

fn main() {
let x = unsafe { std::mem::transmute::<fn(&str), fn(&Foo<str>)>(|_| ()) };
let foo: &Foo<str> = unsafe { &*("uwu" as *const str as *const Foo<str>) };
x(foo);
}

0 comments on commit cf71352

Please sign in to comment.