remove support for rustc_safe_intrinsic attribute; use rustc_intrinsic functions instead

RalfJung · RalfJung · commit f0368983da93 · 2024-11-08T09:16:00.000+01:00
diff --git a/example/mini_core.rs b/example/mini_core.rs
@@ -579,28 +579,70 @@ pub union MaybeUninit<T> {
 }
 
 pub mod intrinsics {
-    use crate::Sized;
-
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
-        #[rustc_safe_intrinsic]
-        pub fn size_of<T>() -> usize;
-        pub fn size_of_val<T: ?Sized>(val: *const T) -> usize;
-        #[rustc_safe_intrinsic]
-        pub fn min_align_of<T>() -> usize;
-        pub fn min_align_of_val<T: ?Sized>(val: *const T) -> usize;
-        pub fn copy<T>(src: *const T, dst: *mut T, count: usize);
-        pub fn transmute<T, U>(e: T) -> U;
-        pub fn ctlz_nonzero<T>(x: T) -> u32;
-        #[rustc_safe_intrinsic]
-        pub fn needs_drop<T: ?Sized>() -> bool;
-        #[rustc_safe_intrinsic]
-        pub fn bitreverse<T>(x: T) -> T;
-        #[rustc_safe_intrinsic]
-        pub fn bswap<T>(x: T) -> T;
-        pub fn write_bytes<T>(dst: *mut T, val: u8, count: usize);
-        pub fn unreachable() -> !;
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
+    }
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn size_of<T>() -> usize {
+        loop {}
+    }
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub unsafe fn size_of_val<T: ?::Sized>(_val: *const T) -> usize {
+        loop {}
+    }
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn min_align_of<T>() -> usize {
+        loop {}
+    }
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub unsafe fn min_align_of_val<T: ?::Sized>(_val: *const T) -> usize {
+        loop {}
+    }
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub unsafe fn copy<T>(_src: *const T, _dst: *mut T, _count: usize) {
+        loop {}
+    }
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub unsafe fn transmute<T, U>(_e: T) -> U {
+        loop {}
+    }
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub unsafe fn ctlz_nonzero<T>(_x: T) -> u32 {
+        loop {}
+    }
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn needs_drop<T: ?::Sized>() -> bool {
+        loop {}
+    }
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn bitreverse<T>(_x: T) -> T {
+        loop {}
+    }
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn bswap<T>(_x: T) -> T {
+        loop {}
+    }
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub unsafe fn write_bytes<T>(_dst: *mut T, _val: u8, _count: usize) {
+        loop {}
+    }
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub unsafe fn unreachable() -> ! {
+        loop {}
     }
 }
 
diff --git a/tests/run/abort1.rs b/tests/run/abort1.rs
@@ -33,9 +33,11 @@ pub(crate) unsafe auto trait Freeze {}
 mod intrinsics {
     use super::Sized;
 
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
+    #[rustc_nounwind]
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
     }
 }
 
diff --git a/tests/run/abort2.rs b/tests/run/abort2.rs
@@ -33,9 +33,11 @@ pub(crate) unsafe auto trait Freeze {}
 mod intrinsics {
     use super::Sized;
 
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
+    #[rustc_nounwind]
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
     }
 }
 
diff --git a/tests/run/array.rs b/tests/run/array.rs
@@ -106,9 +106,11 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 }
 
 mod intrinsics {
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
+    #[rustc_nounwind]
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
     }
 }
 
diff --git a/tests/run/assign.rs b/tests/run/assign.rs
@@ -56,9 +56,11 @@ mod libc {
 }
 
 mod intrinsics {
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
+    #[rustc_nounwind]
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
     }
 }
 
diff --git a/tests/run/closure.rs b/tests/run/closure.rs
@@ -98,9 +98,11 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 }
 
 mod intrinsics {
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
+    #[rustc_nounwind]
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
     }
 }
 
diff --git a/tests/run/condition.rs b/tests/run/condition.rs
@@ -109,9 +109,11 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 }
 
 mod intrinsics {
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
+    #[rustc_nounwind]
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
     }
 }
 
diff --git a/tests/run/fun_ptr.rs b/tests/run/fun_ptr.rs
@@ -103,9 +103,11 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 }
 
 mod intrinsics {
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
+    #[rustc_nounwind]
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
     }
 }
 
diff --git a/tests/run/mut_ref.rs b/tests/run/mut_ref.rs
@@ -58,9 +58,11 @@ mod libc {
 }
 
 mod intrinsics {
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
+    #[rustc_nounwind]
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
     }
 }
 
diff --git a/tests/run/operations.rs b/tests/run/operations.rs
@@ -64,9 +64,11 @@ mod libc {
 }
 
 mod intrinsics {
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
+    #[rustc_nounwind]
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
     }
 }
 
diff --git a/tests/run/ptr_cast.rs b/tests/run/ptr_cast.rs
@@ -103,9 +103,11 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 }
 
 mod intrinsics {
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
+    #[rustc_nounwind]
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
     }
 }
 
diff --git a/tests/run/slice.rs b/tests/run/slice.rs
@@ -103,9 +103,11 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 mod intrinsics {
     use super::Sized;
 
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
+    #[rustc_nounwind]
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
     }
 }
 
diff --git a/tests/run/static.rs b/tests/run/static.rs
@@ -46,9 +46,11 @@ pub(crate) unsafe auto trait Freeze {}
 mod intrinsics {
     use super::Sized;
 
-    extern "rust-intrinsic" {
-        #[rustc_safe_intrinsic]
-        pub fn abort() -> !;
+    #[rustc_nounwind]
+    #[rustc_intrinsic]
+    #[rustc_intrinsic_must_be_overridden]
+    pub fn abort() -> ! {
+        loop {}
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,11 @@ pub(crate) unsafe auto trait Freeze {}`
`33`	`33`	`mod intrinsics {`
`34`	`34`	`use super::Sized;`
`35`	`35`
`36`		`- extern "rust-intrinsic" {`
`37`		`- #[rustc_safe_intrinsic]`
`38`		`- pub fn abort() -> !;`
	`36`	`+ #[rustc_nounwind]`
	`37`	`+ #[rustc_intrinsic]`
	`38`	`+ #[rustc_intrinsic_must_be_overridden]`
	`39`	`+ pub fn abort() -> ! {`
	`40`	`+ loop {}`
`39`	`41`	`}`
`40`	`42`	`}`
`41`	`43`
Original file line number	Diff line number	Diff line change
`@@ -106,9 +106,11 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`mod intrinsics {`
`109`		`- extern "rust-intrinsic" {`
`110`		`- #[rustc_safe_intrinsic]`
`111`		`- pub fn abort() -> !;`
	`109`	`+ #[rustc_nounwind]`
	`110`	`+ #[rustc_intrinsic]`
	`111`	`+ #[rustc_intrinsic_must_be_overridden]`
	`112`	`+ pub fn abort() -> ! {`
	`113`	`+ loop {}`
`112`	`114`	`}`
`113`	`115`	`}`
`114`	`116`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,11 @@ mod libc {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`mod intrinsics {`
`59`		`- extern "rust-intrinsic" {`
`60`		`- #[rustc_safe_intrinsic]`
`61`		`- pub fn abort() -> !;`
	`59`	`+ #[rustc_nounwind]`
	`60`	`+ #[rustc_intrinsic]`
	`61`	`+ #[rustc_intrinsic_must_be_overridden]`
	`62`	`+ pub fn abort() -> ! {`
	`63`	`+ loop {}`
`62`	`64`	`}`
`63`	`65`	`}`
`64`	`66`
Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,11 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`mod intrinsics {`
`101`		`- extern "rust-intrinsic" {`
`102`		`- #[rustc_safe_intrinsic]`
`103`		`- pub fn abort() -> !;`
	`101`	`+ #[rustc_nounwind]`
	`102`	`+ #[rustc_intrinsic]`
	`103`	`+ #[rustc_intrinsic_must_be_overridden]`
	`104`	`+ pub fn abort() -> ! {`
	`105`	`+ loop {}`
`104`	`106`	`}`
`105`	`107`	`}`
`106`	`108`
Original file line number	Diff line number	Diff line change
`@@ -109,9 +109,11 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`mod intrinsics {`
`112`		`- extern "rust-intrinsic" {`
`113`		`- #[rustc_safe_intrinsic]`
`114`		`- pub fn abort() -> !;`
	`112`	`+ #[rustc_nounwind]`
	`113`	`+ #[rustc_intrinsic]`
	`114`	`+ #[rustc_intrinsic_must_be_overridden]`
	`115`	`+ pub fn abort() -> ! {`
	`116`	`+ loop {}`
`115`	`117`	`}`
`116`	`118`	`}`
`117`	`119`
Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,11 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`mod intrinsics {`
`106`		`- extern "rust-intrinsic" {`
`107`		`- #[rustc_safe_intrinsic]`
`108`		`- pub fn abort() -> !;`
	`106`	`+ #[rustc_nounwind]`
	`107`	`+ #[rustc_intrinsic]`
	`108`	`+ #[rustc_intrinsic_must_be_overridden]`
	`109`	`+ pub fn abort() -> ! {`
	`110`	`+ loop {}`
`109`	`111`	`}`
`110`	`112`	`}`
`111`	`113`
Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,11 @@ mod libc {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`mod intrinsics {`
`61`		`- extern "rust-intrinsic" {`
`62`		`- #[rustc_safe_intrinsic]`
`63`		`- pub fn abort() -> !;`
	`61`	`+ #[rustc_nounwind]`
	`62`	`+ #[rustc_intrinsic]`
	`63`	`+ #[rustc_intrinsic_must_be_overridden]`
	`64`	`+ pub fn abort() -> ! {`
	`65`	`+ loop {}`
`64`	`66`	`}`
`65`	`67`	`}`
`66`	`68`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,11 @@ mod libc {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`mod intrinsics {`
`67`		`- extern "rust-intrinsic" {`
`68`		`- #[rustc_safe_intrinsic]`
`69`		`- pub fn abort() -> !;`
	`67`	`+ #[rustc_nounwind]`
	`68`	`+ #[rustc_intrinsic]`
	`69`	`+ #[rustc_intrinsic_must_be_overridden]`
	`70`	`+ pub fn abort() -> ! {`
	`71`	`+ loop {}`
`70`	`72`	`}`
`71`	`73`	`}`
`72`	`74`