Skip to content

Commit f8f22ad

Browse files
authored
Rollup merge of rust-lang#139915 - RalfJung:intrinsic-imports, r=compiler-errors
replace some #[rustc_intrinsic] usage with use of the libcore declarations Better to centralize the `#[rustc_intrinsic]` declarations in libcore than have them spread across the test suite as well.
2 parents 9e0be6c + face471 commit f8f22ad

File tree

2 files changed

+4
-52
lines changed

2 files changed

+4
-52
lines changed

Diff for: tests/codegen/intrinsic-no-unnamed-attr.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
//@ compile-flags: -C no-prepopulate-passes
22

3-
#![feature(intrinsics)]
3+
#![feature(core_intrinsics)]
44

5-
#[rustc_intrinsic]
6-
unsafe fn sqrtf32(x: f32) -> f32;
5+
use std::intrinsics::sqrtf32;
76

87
// CHECK: @llvm.sqrt.f32(float) #{{[0-9]*}}
98

Diff for: tests/ui/intrinsics/intrinsic-atomics.rs

+2-49
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,6 @@
11
//@ run-pass
2-
#![feature(intrinsics)]
3-
4-
mod rusti {
5-
6-
#[rustc_intrinsic]
7-
pub unsafe fn atomic_cxchg_seqcst_seqcst<T>(dst: *mut T, old: T, src: T) -> (T, bool);
8-
#[rustc_intrinsic]
9-
pub unsafe fn atomic_cxchg_acquire_acquire<T>(dst: *mut T, old: T, src: T) -> (T, bool);
10-
#[rustc_intrinsic]
11-
pub unsafe fn atomic_cxchg_release_relaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
12-
13-
#[rustc_intrinsic]
14-
pub unsafe fn atomic_cxchgweak_seqcst_seqcst<T>(dst: *mut T, old: T, src: T) -> (T, bool);
15-
#[rustc_intrinsic]
16-
pub unsafe fn atomic_cxchgweak_acquire_acquire<T>(dst: *mut T, old: T, src: T) -> (T, bool);
17-
#[rustc_intrinsic]
18-
pub unsafe fn atomic_cxchgweak_release_relaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
19-
20-
#[rustc_intrinsic]
21-
pub unsafe fn atomic_load_seqcst<T>(src: *const T) -> T;
22-
#[rustc_intrinsic]
23-
pub unsafe fn atomic_load_acquire<T>(src: *const T) -> T;
24-
25-
#[rustc_intrinsic]
26-
pub unsafe fn atomic_store_seqcst<T>(dst: *mut T, val: T);
27-
#[rustc_intrinsic]
28-
pub unsafe fn atomic_store_release<T>(dst: *mut T, val: T);
29-
30-
#[rustc_intrinsic]
31-
pub unsafe fn atomic_xchg_seqcst<T>(dst: *mut T, src: T) -> T;
32-
#[rustc_intrinsic]
33-
pub unsafe fn atomic_xchg_acquire<T>(dst: *mut T, src: T) -> T;
34-
#[rustc_intrinsic]
35-
pub unsafe fn atomic_xchg_release<T>(dst: *mut T, src: T) -> T;
36-
37-
#[rustc_intrinsic]
38-
pub unsafe fn atomic_xadd_seqcst<T>(dst: *mut T, src: T) -> T;
39-
#[rustc_intrinsic]
40-
pub unsafe fn atomic_xadd_acquire<T>(dst: *mut T, src: T) -> T;
41-
#[rustc_intrinsic]
42-
pub unsafe fn atomic_xadd_release<T>(dst: *mut T, src: T) -> T;
43-
44-
#[rustc_intrinsic]
45-
pub unsafe fn atomic_xsub_seqcst<T>(dst: *mut T, src: T) -> T;
46-
#[rustc_intrinsic]
47-
pub unsafe fn atomic_xsub_acquire<T>(dst: *mut T, src: T) -> T;
48-
#[rustc_intrinsic]
49-
pub unsafe fn atomic_xsub_release<T>(dst: *mut T, src: T) -> T;
50-
}
2+
#![feature(core_intrinsics)]
3+
use std::intrinsics as rusti;
514

525
pub fn main() {
536
unsafe {

0 commit comments

Comments
 (0)