Skip to content

Commit 15f0dca

Browse files
committed
remove support for rustc_intrinsic_must_be_overridden from the compiler
1 parent a9e8cfe commit 15f0dca

File tree

7 files changed

+19
-76
lines changed

7 files changed

+19
-76
lines changed

example/mini_core.rs

Lines changed: 13 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -591,70 +591,31 @@ pub union MaybeUninit<T> {
591591

592592
pub mod intrinsics {
593593
#[rustc_intrinsic]
594-
#[rustc_intrinsic_must_be_overridden]
595-
pub fn abort() -> ! {
596-
loop {}
597-
}
594+
pub fn abort() -> !;
598595
#[rustc_intrinsic]
599-
#[rustc_intrinsic_must_be_overridden]
600-
pub fn size_of<T>() -> usize {
601-
loop {}
602-
}
596+
pub fn size_of<T>() -> usize;
603597
#[rustc_intrinsic]
604-
#[rustc_intrinsic_must_be_overridden]
605-
pub unsafe fn size_of_val<T: ?::Sized>(_val: *const T) -> usize {
606-
loop {}
607-
}
598+
pub unsafe fn size_of_val<T: ?::Sized>(_val: *const T) -> usize;
608599
#[rustc_intrinsic]
609-
#[rustc_intrinsic_must_be_overridden]
610-
pub fn min_align_of<T>() -> usize {
611-
loop {}
612-
}
600+
pub fn min_align_of<T>() -> usize;
613601
#[rustc_intrinsic]
614-
#[rustc_intrinsic_must_be_overridden]
615-
pub unsafe fn min_align_of_val<T: ?::Sized>(_val: *const T) -> usize {
616-
loop {}
617-
}
602+
pub unsafe fn min_align_of_val<T: ?::Sized>(_val: *const T) -> usize;
618603
#[rustc_intrinsic]
619-
#[rustc_intrinsic_must_be_overridden]
620-
pub unsafe fn copy<T>(_src: *const T, _dst: *mut T, _count: usize) {
621-
loop {}
622-
}
604+
pub unsafe fn copy<T>(_src: *const T, _dst: *mut T, _count: usize);
623605
#[rustc_intrinsic]
624-
#[rustc_intrinsic_must_be_overridden]
625-
pub unsafe fn transmute<T, U>(_e: T) -> U {
626-
loop {}
627-
}
606+
pub unsafe fn transmute<T, U>(_e: T) -> U;
628607
#[rustc_intrinsic]
629-
#[rustc_intrinsic_must_be_overridden]
630-
pub unsafe fn ctlz_nonzero<T>(_x: T) -> u32 {
631-
loop {}
632-
}
608+
pub unsafe fn ctlz_nonzero<T>(_x: T) -> u32;
633609
#[rustc_intrinsic]
634-
#[rustc_intrinsic_must_be_overridden]
635-
pub fn needs_drop<T: ?::Sized>() -> bool {
636-
loop {}
637-
}
610+
pub fn needs_drop<T: ?::Sized>() -> bool;
638611
#[rustc_intrinsic]
639-
#[rustc_intrinsic_must_be_overridden]
640-
pub fn bitreverse<T>(_x: T) -> T {
641-
loop {}
642-
}
612+
pub fn bitreverse<T>(_x: T) -> T;
643613
#[rustc_intrinsic]
644-
#[rustc_intrinsic_must_be_overridden]
645-
pub fn bswap<T>(_x: T) -> T {
646-
loop {}
647-
}
614+
pub fn bswap<T>(_x: T) -> T;
648615
#[rustc_intrinsic]
649-
#[rustc_intrinsic_must_be_overridden]
650-
pub unsafe fn write_bytes<T>(_dst: *mut T, _val: u8, _count: usize) {
651-
loop {}
652-
}
616+
pub unsafe fn write_bytes<T>(_dst: *mut T, _val: u8, _count: usize);
653617
#[rustc_intrinsic]
654-
#[rustc_intrinsic_must_be_overridden]
655-
pub unsafe fn unreachable() -> ! {
656-
loop {}
657-
}
618+
pub unsafe fn unreachable() -> !;
658619
}
659620

660621
pub mod libc {

tests/run/abort1.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ mod intrinsics {
3636

3737
#[rustc_nounwind]
3838
#[rustc_intrinsic]
39-
#[rustc_intrinsic_must_be_overridden]
40-
pub fn abort() -> ! {
41-
loop {}
42-
}
39+
pub fn abort() -> !;
4340
}
4441

4542
/*

tests/run/abort2.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ mod intrinsics {
3636

3737
#[rustc_nounwind]
3838
#[rustc_intrinsic]
39-
#[rustc_intrinsic_must_be_overridden]
40-
pub fn abort() -> ! {
41-
loop {}
42-
}
39+
pub fn abort() -> !;
4340
}
4441

4542
/*

tests/run/assign.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ mod libc {
5959
mod intrinsics {
6060
#[rustc_nounwind]
6161
#[rustc_intrinsic]
62-
#[rustc_intrinsic_must_be_overridden]
63-
pub fn abort() -> ! {
64-
loop {}
65-
}
62+
pub fn abort() -> !;
6663
}
6764

6865
#[lang = "panic"]

tests/run/mut_ref.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@ mod libc {
6161
mod intrinsics {
6262
#[rustc_nounwind]
6363
#[rustc_intrinsic]
64-
#[rustc_intrinsic_must_be_overridden]
65-
pub fn abort() -> ! {
66-
loop {}
67-
}
64+
pub fn abort() -> !;
6865
}
6966

7067
#[lang = "panic"]

tests/run/operations.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,7 @@ mod libc {
6767
mod intrinsics {
6868
#[rustc_nounwind]
6969
#[rustc_intrinsic]
70-
#[rustc_intrinsic_must_be_overridden]
71-
pub fn abort() -> ! {
72-
loop {}
73-
}
70+
pub fn abort() -> !;
7471
}
7572

7673
#[lang = "panic"]

tests/run/static.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ mod intrinsics {
4949

5050
#[rustc_nounwind]
5151
#[rustc_intrinsic]
52-
#[rustc_intrinsic_must_be_overridden]
53-
pub fn abort() -> ! {
54-
loop {}
55-
}
52+
pub fn abort() -> !;
5653
}
5754

5855
mod libc {

0 commit comments

Comments
 (0)