Merge pull request #18137 from parker-timmerman/miri/fix-test

miri: Add separate initializer for SOFT_ASSERTIONS

Author: do-not-use-parker-timmerman

src/ore/src/assert.rs

@@ -51,12 +51,23 @@ use crate::env;
 // The rules about what you can do in a `ctor` function are somewhat fuzzy,
 // because Rust does not explicitly support constructors. But a scan of the
 // stdlib suggests that reading environment variables is safe enough.
+#[cfg(not(miri))]
 #[ctor::ctor]
 pub static SOFT_ASSERTIONS: AtomicBool = {
     let default = cfg!(debug_assertions) || env::is_var_truthy("MZ_SOFT_ASSERTIONS");
     AtomicBool::new(default)
 };
 
+/// Always enable soft assertions when running [Miri].
+///
+/// Note: Miri also doesn't support global constructors, aka [`ctor`], if it ever does we could
+/// get rid of this second definition. See <https://github.com/rust-lang/miri/issues/450> for
+/// more details.
+///
+/// [Miri]: https://github.com/rust-lang/miri
+#[cfg(miri)]
+pub static SOFT_ASSERTIONS: AtomicBool = AtomicBool::new(true);
+
 /// Asserts that a condition is true if soft assertions are enabled.
 ///
 /// Soft assertions have a small runtime cost even when disabled. See

src/stash/tests/stash.rs

@@ -925,7 +925,6 @@ async fn test_stash_table(stash: &mut Stash) {
 }
 
 #[test]
-#[cfg_attr(miri, ignore)] // Broken, see #18122
 fn test_table() {
     fn uniqueness_violation(a: &String, b: &String) -> bool {
         a == b