From 6a06bfc2520e94d1220e7828964034617a2ba922 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 19 Aug 2020 09:56:38 +0200
Subject: [PATCH] enable align_to tests in Miri

---
 library/core/tests/ascii.rs | 8 +++-----
 library/core/tests/ptr.rs   | 7 +++----
 library/core/tests/slice.rs | 2 --
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/library/core/tests/ascii.rs b/library/core/tests/ascii.rs
index 57f2de16b2b..0b975083947 100644
--- a/library/core/tests/ascii.rs
+++ b/library/core/tests/ascii.rs
@@ -361,10 +361,8 @@ fn test_is_ascii_align_size_thoroughly() {
         repeat(b0).take(l).chain(repeat(b1).take(l)).collect()
     }
 
-    // Miri is too slow for much of this, and in miri `align_offset` always
-    // returns `usize::max_value()` anyway (at the moment), so we just test
-    // lightly.
-    let iter = if cfg!(miri) { 0..5 } else { 0..100 };
+    // Miri is too slow
+    let iter = if cfg!(miri) { 0..20 } else { 0..100 };
 
     for i in iter {
         #[cfg(not(miri))]
@@ -379,7 +377,7 @@ fn test_is_ascii_align_size_thoroughly() {
         ];
 
         #[cfg(miri)]
-        let cases = &[repeat_concat(b'a', 0x80u8, i)];
+        let cases = &[b"a".repeat(i), b"\x80".repeat(i), repeat_concat(b'a', 0x80u8, i)];
 
         for case in cases {
             for pos in 0..=case.len() {
diff --git a/library/core/tests/ptr.rs b/library/core/tests/ptr.rs
index 9fea34d668f..bf977c141cb 100644
--- a/library/core/tests/ptr.rs
+++ b/library/core/tests/ptr.rs
@@ -300,7 +300,6 @@ fn write_unaligned_drop() {
 }
 
 #[test]
-#[cfg_attr(miri, ignore)] // Miri does not compute a maximal `mid` for `align_offset`
 fn align_offset_zst() {
     // For pointers of stride = 0, the pointer is already aligned or it cannot be aligned at
     // all, because no amount of elements will align the pointer.
@@ -315,7 +314,6 @@ fn align_offset_zst() {
 }
 
 #[test]
-#[cfg_attr(miri, ignore)] // Miri does not compute a maximal `mid` for `align_offset`
 fn align_offset_stride1() {
     // For pointers of stride = 1, the pointer can always be aligned. The offset is equal to
     // number of bytes.
@@ -337,7 +335,6 @@ fn align_offset_stride1() {
 }
 
 #[test]
-#[cfg_attr(miri, ignore)] // Miri is too slow
 fn align_offset_weird_strides() {
     #[repr(packed)]
     struct A3(u16, u8);
@@ -384,7 +381,9 @@ fn align_offset_weird_strides() {
     // implementation
     let mut align = 1;
     let mut x = false;
-    while align < 1024 {
+    // Miri is too slow
+    let limit = if cfg!(miri) { 32 } else { 1024 };
+    while align < limit {
         for ptr in 1usize..4 * align {
             unsafe {
                 x |= test_weird_stride::<A3>(ptr as *const A3, align);
diff --git a/library/core/tests/slice.rs b/library/core/tests/slice.rs
index 42b483f33ba..5650c98f9c7 100644
--- a/library/core/tests/slice.rs
+++ b/library/core/tests/slice.rs
@@ -1630,7 +1630,6 @@ pub mod memchr {
 }
 
 #[test]
-#[cfg_attr(miri, ignore)] // Miri does not compute a maximal `mid` for `align_offset`
 fn test_align_to_simple() {
     let bytes = [1u8, 2, 3, 4, 5, 6, 7];
     let (prefix, aligned, suffix) = unsafe { bytes.align_to::<u16>() };
@@ -1660,7 +1659,6 @@ fn test_align_to_zst() {
 }
 
 #[test]
-#[cfg_attr(miri, ignore)] // Miri does not compute a maximal `mid` for `align_offset`
 fn test_align_to_non_trivial() {
     #[repr(align(8))]
     struct U64(u64, u64);