Make sgx functions exist with cfg(miri) (#591)

saethlin · web-flow · commit ea7dc8e964d0 · 2024-03-14T10:52:51.000-07:00
diff --git a/src/backtrace/mod.rs b/src/backtrace/mod.rs
@@ -125,7 +125,7 @@ impl fmt::Debug for Frame {
     }
 }
 
-#[cfg(all(target_env = "sgx", target_vendor = "fortanix", not(miri)))]
+#[cfg(all(target_env = "sgx", target_vendor = "fortanix"))]
 mod sgx_image_base {
 
     #[cfg(not(feature = "std"))]
@@ -160,12 +160,7 @@ mod sgx_image_base {
     pub(crate) use imp::get_image_base;
 }
 
-#[cfg(all(
-    target_env = "sgx",
-    target_vendor = "fortanix",
-    not(feature = "std"),
-    not(miri)
-))]
+#[cfg(all(target_env = "sgx", target_vendor = "fortanix", not(feature = "std")))]
 pub use sgx_image_base::imp::set_image_base;
 
 cfg_if::cfg_if! {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ impl fmt::Debug for Frame {`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`-#[cfg(all(target_env = "sgx", target_vendor = "fortanix", not(miri)))]`
	`128`	`+#[cfg(all(target_env = "sgx", target_vendor = "fortanix"))]`
`129`	`129`	`mod sgx_image_base {`
`130`	`130`
`131`	`131`	`#[cfg(not(feature = "std"))]`
`@@ -160,12 +160,7 @@ mod sgx_image_base {`
`160`	`160`	`pub(crate) use imp::get_image_base;`
`161`	`161`	`}`
`162`	`162`
`163`		`-#[cfg(all(`
`164`		`- target_env = "sgx",`
`165`		`- target_vendor = "fortanix",`
`166`		`- not(feature = "std"),`
`167`		`- not(miri)`
`168`		`-))]`
	`163`	`+#[cfg(all(target_env = "sgx", target_vendor = "fortanix", not(feature = "std")))]`
`169`	`164`	`pub use sgx_image_base::imp::set_image_base;`
`170`	`165`
`171`	`166`	`cfg_if::cfg_if! {`