Merge from rustc

The Miri Cronjob Bot · The Miri Cronjob Bot · commit dcfef5a0606b · 2024-06-23T05:01:42.000Z
diff --git a/src/alloc_bytes.rs b/src/alloc_bytes.rs
@@ -112,4 +112,8 @@ impl AllocBytes for MiriAllocBytes {
     fn as_mut_ptr(&mut self) -> *mut u8 {
         self.ptr
     }
+
+    fn as_ptr(&self) -> *const u8 {
+        self.ptr
+    }
 }
diff --git a/tests/fail/intrinsic_fallback_is_spec.rs b/tests/fail/intrinsic_fallback_is_spec.rs
@@ -1,4 +1,4 @@
-#![feature(rustc_attrs, effects)]
+#![feature(rustc_attrs)]
 
 #[rustc_intrinsic]
 #[rustc_nounwind]

Original file line number	Diff line number	Diff line change
`@@ -112,4 +112,8 @@ impl AllocBytes for MiriAllocBytes {`
`112`	`112`	`fn as_mut_ptr(&mut self) -> *mut u8 {`
`113`	`113`	`self.ptr`
`114`	`114`	`}`
	`115`	`+`
	`116`	`+ fn as_ptr(&self) -> *const u8 {`
	`117`	`+ self.ptr`
	`118`	`+ }`
`115`	`119`	`}`