diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-11-16 09:14:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 09:14:23 +0900 |
| commit | 35dd1f65e906b5c84260a9c6c4ccd41c7fa2517c (patch) | |
| tree | f816361c6ec528fb3cd430b0384bbe4c18bad487 | |
| parent | fff9055afb8b7d3eb7a2921ec3fa05aa99b318e5 (diff) | |
| parent | 60595f7bde03c6c17a798f1aed6fb8bedd9bd3ca (diff) | |
| download | rust-35dd1f65e906b5c84260a9c6c4ccd41c7fa2517c.tar.gz rust-35dd1f65e906b5c84260a9c6c4ccd41c7fa2517c.zip | |
Rollup merge of #90909 - RalfJung:miri-no-portable-simd, r=workingjubilee
disable portable SIMD tests in Miri Until https://github.com/rust-lang/miri/issues/1912 is resolved, we'll have to skip these tests in Miri.
| -rw-r--r-- | library/core/src/lib.rs | 2 | ||||
| -rw-r--r-- | library/core/tests/simd.rs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs index 584b90d613f..e4a566f5895 100644 --- a/library/core/src/lib.rs +++ b/library/core/src/lib.rs @@ -402,11 +402,13 @@ pub mod arch { #[allow(missing_debug_implementations, dead_code, unsafe_op_in_unsafe_fn, unused_unsafe)] #[allow(rustdoc::bare_urls)] #[unstable(feature = "portable_simd", issue = "86656")] +#[cfg(not(all(miri, doctest)))] // Miri does not support all SIMD intrinsics #[cfg(not(bootstrap))] mod core_simd; #[doc = include_str!("../../portable-simd/crates/core_simd/src/core_simd_docs.md")] #[unstable(feature = "portable_simd", issue = "86656")] +#[cfg(not(all(miri, doctest)))] // Miri does not support all SIMD intrinsics #[cfg(not(bootstrap))] pub mod simd { #[unstable(feature = "portable_simd", issue = "86656")] diff --git a/library/core/tests/simd.rs b/library/core/tests/simd.rs index 8c11d788c67..50c92968c9d 100644 --- a/library/core/tests/simd.rs +++ b/library/core/tests/simd.rs @@ -1,3 +1,5 @@ +#![cfg(not(miri))] // Miri does not support all SIMD intrinsics + use core::simd::f32x4; #[test] |