Skip to content

Commit dde7f13

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#135333
Rollup merge of rust-lang#135333 - vayunbiyani:test-environment, r=RalfJung Partial progress on rust-lang#132735: Replace extern "rust-intrinsic" with #[rustc_intrinsic] across the codebase Part of rust-lang#132735: Replace `extern "rust-intrinsic"` with `#[rustc_intrinsic]` macro - Updated all instances of `extern "rust-intrinsic"` to use the `#[rustc_intrinsic]` macro. - Skipped `.md` files and test files to avoid unnecessary changes.
2 parents 9f4d9dc + c79fc90 commit dde7f13

29 files changed

+61
-85
lines changed

‎compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//! Codegen of intrinsics. This includes `extern "rust-intrinsic"`,
2+
//! functions marked with the `#[rustc_intrinsic]` attribute
23
//! and LLVM intrinsics that have symbol names starting with `llvm.`.
34
45
macro_rules! intrinsic_args {

‎src/tools/miri/tests/fail/intrinsics/copy_overlapping.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: usize);
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn copy_nonoverlapping<T>(_src: *const T, _dst: *mut T, _count: usize);
76

87
fn main() {
98
let mut data = [0u8; 16];

‎src/tools/miri/tests/fail/intrinsics/copy_unaligned.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: usize);
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn copy_nonoverlapping<T>(_src: *const T, _dst: *mut T, _count: usize);
76

87
fn main() {
98
let mut data = [0u16; 8];

‎src/tools/miri/tests/fail/intrinsics/ctlz_nonzero.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
mod rusti {
4-
extern "rust-intrinsic" {
5-
pub fn ctlz_nonzero<T>(x: T) -> u32;
6-
}
4+
#[rustc_intrinsic]
5+
pub unsafe fn ctlz_nonzero<T>(_x: T) -> u32;
76
}
87

98
pub fn main() {

‎src/tools/miri/tests/fail/intrinsics/cttz_nonzero.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
12
#![feature(intrinsics)]
23

34
mod rusti {
4-
extern "rust-intrinsic" {
5-
pub fn cttz_nonzero<T>(x: T) -> u32;
6-
}
5+
#[rustc_intrinsic]
6+
pub unsafe fn cttz_nonzero<T>(_x: T) -> u32;
77
}
88

99
pub fn main() {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_32_inf1.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_32_infneg1.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_32_nan.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_32_nanneg.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
6+
77

88
fn main() {
99
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_32_neg.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_32_too_big1.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_32_too_big2.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_32_too_small1.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_inf1.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_infneg1.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
6+
77

88
fn main() {
99
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_infneg2.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_nan.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_neg.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_too_big1.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_too_big2.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_too_big3.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_too_big4.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_too_big5.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_too_big6.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_too_big7.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_too_small1.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_too_small2.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/fail/intrinsics/float_to_int_64_too_small3.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#![feature(intrinsics)]
22

33
// Directly call intrinsic to avoid debug assertions in libstd
4-
extern "rust-intrinsic" {
5-
fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
6-
}
4+
#[rustc_intrinsic]
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
76

87
fn main() {
98
unsafe {

‎src/tools/miri/tests/pass/intrinsics/portable-simd.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ use std::ptr;
1414
use std::simd::StdFloat;
1515
use std::simd::prelude::*;
1616

17-
extern "rust-intrinsic" {
18-
#[rustc_nounwind]
19-
pub fn simd_shuffle_generic<T, U, const IDX: &'static [u32]>(x: T, y: T) -> U;
20-
}
17+
#[rustc_intrinsic]
18+
#[rustc_nounwind]
19+
pub unsafe fn simd_shuffle_generic<T, U, const IDX: &'static [u32]>(_x: T, _y: T) -> U;
2120

2221
fn simd_ops_f32() {
2322
let a = f32x4::splat(10.0);

0 commit comments

Comments
 (0)