Skip to content

Commit 51d0f68

Browse files
committed
Update the MIRI tests
1 parent 24c5050 commit 51d0f68

9 files changed

+30
-30
lines changed

src/tools/miri/tests/fail/intrinsics/simd-div-by-zero.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use std::intrinsics::simd::simd_div;
44

55
#[repr(simd)]
66
#[allow(non_camel_case_types)]
7-
struct i32x2(i32, i32);
7+
struct i32x2([i32; 2]);
88

99
fn main() {
1010
unsafe {
11-
let x = i32x2(1, 1);
12-
let y = i32x2(1, 0);
11+
let x = i32x2([1, 1]);
12+
let y = i32x2([1, 0]);
1313
simd_div(x, y); //~ERROR: Undefined Behavior: dividing by zero
1414
}
1515
}

src/tools/miri/tests/fail/intrinsics/simd-div-overflow.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use std::intrinsics::simd::simd_div;
44

55
#[repr(simd)]
66
#[allow(non_camel_case_types)]
7-
struct i32x2(i32, i32);
7+
struct i32x2([i32; 2]);
88

99
fn main() {
1010
unsafe {
11-
let x = i32x2(1, i32::MIN);
12-
let y = i32x2(1, -1);
11+
let x = i32x2([1, i32::MIN]);
12+
let y = i32x2([1, -1]);
1313
simd_div(x, y); //~ERROR: Undefined Behavior: overflow in signed division
1414
}
1515
}

src/tools/miri/tests/fail/intrinsics/simd-reduce-invalid-bool.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ use std::intrinsics::simd::simd_reduce_any;
44

55
#[repr(simd)]
66
#[allow(non_camel_case_types)]
7-
struct i32x2(i32, i32);
7+
struct i32x2([i32; 2]);
88

99
fn main() {
1010
unsafe {
11-
let x = i32x2(0, 1);
11+
let x = i32x2([0, 1]);
1212
simd_reduce_any(x); //~ERROR: must be all-0-bits or all-1-bits
1313
}
1414
}

src/tools/miri/tests/fail/intrinsics/simd-rem-by-zero.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use std::intrinsics::simd::simd_rem;
44

55
#[repr(simd)]
66
#[allow(non_camel_case_types)]
7-
struct i32x2(i32, i32);
7+
struct i32x2([i32; 2]);
88

99
fn main() {
1010
unsafe {
11-
let x = i32x2(1, 1);
12-
let y = i32x2(1, 0);
11+
let x = i32x2([1, 1]);
12+
let y = i32x2([1, 0]);
1313
simd_rem(x, y); //~ERROR: Undefined Behavior: calculating the remainder with a divisor of zero
1414
}
1515
}

src/tools/miri/tests/fail/intrinsics/simd-select-bitmask-invalid.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ use std::intrinsics::simd::simd_select_bitmask;
55
#[repr(simd)]
66
#[allow(non_camel_case_types)]
77
#[derive(Copy, Clone)]
8-
struct i32x2(i32, i32);
8+
struct i32x2([i32; 2]);
99

1010
fn main() {
1111
unsafe {
12-
let x = i32x2(0, 1);
12+
let x = i32x2([0, 1]);
1313
simd_select_bitmask(0b11111111u8, x, x); //~ERROR: bitmask less than 8 bits long must be filled with 0s for the remaining bits
1414
}
1515
}

src/tools/miri/tests/fail/intrinsics/simd-select-invalid-bool.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ use std::intrinsics::simd::simd_select;
55
#[repr(simd)]
66
#[allow(non_camel_case_types)]
77
#[derive(Copy, Clone)]
8-
struct i32x2(i32, i32);
8+
struct i32x2([i32; 2]);
99

1010
fn main() {
1111
unsafe {
12-
let x = i32x2(0, 1);
12+
let x = i32x2([0, 1]);
1313
simd_select(x, x, x); //~ERROR: must be all-0-bits or all-1-bits
1414
}
1515
}

src/tools/miri/tests/fail/intrinsics/simd-shl-too-far.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use std::intrinsics::simd::simd_shl;
44

55
#[repr(simd)]
66
#[allow(non_camel_case_types)]
7-
struct i32x2(i32, i32);
7+
struct i32x2([i32; 2]);
88

99
fn main() {
1010
unsafe {
11-
let x = i32x2(1, 1);
12-
let y = i32x2(100, 0);
11+
let x = i32x2([1, 1]);
12+
let y = i32x2([100, 0]);
1313
simd_shl(x, y); //~ERROR: overflowing shift by 100 in `simd_shl` in lane 0
1414
}
1515
}

src/tools/miri/tests/fail/intrinsics/simd-shr-too-far.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use std::intrinsics::simd::simd_shr;
44

55
#[repr(simd)]
66
#[allow(non_camel_case_types)]
7-
struct i32x2(i32, i32);
7+
struct i32x2([i32; 2]);
88

99
fn main() {
1010
unsafe {
11-
let x = i32x2(1, 1);
12-
let y = i32x2(20, 40);
11+
let x = i32x2([1, 1]);
12+
let y = i32x2([20, 40]);
1313
simd_shr(x, y); //~ERROR: overflowing shift by 40 in `simd_shr` in lane 1
1414
}
1515
}

src/tools/miri/tests/pass/simd-intrinsic-generic-elements.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
#[repr(simd)]
44
#[derive(Copy, Clone, Debug, PartialEq)]
55
#[allow(non_camel_case_types)]
6-
struct i32x2(i32, i32);
6+
struct i32x2([i32; 2]);
77
#[repr(simd)]
88
#[derive(Copy, Clone, Debug, PartialEq)]
99
#[allow(non_camel_case_types)]
10-
struct i32x4(i32, i32, i32, i32);
10+
struct i32x4([i32; 4]);
1111
#[repr(simd)]
1212
#[derive(Copy, Clone, Debug, PartialEq)]
1313
#[allow(non_camel_case_types)]
14-
struct i32x8(i32, i32, i32, i32, i32, i32, i32, i32);
14+
struct i32x8([i32; 8]);
1515

1616
fn main() {
17-
let _x2 = i32x2(20, 21);
18-
let _x4 = i32x4(40, 41, 42, 43);
19-
let _x8 = i32x8(80, 81, 82, 83, 84, 85, 86, 87);
17+
let _x2 = i32x2([20, 21]);
18+
let _x4 = i32x4([40, 41, 42, 43]);
19+
let _x8 = i32x8([80, 81, 82, 83, 84, 85, 86, 87]);
2020

21-
let _y2 = i32x2(120, 121);
22-
let _y4 = i32x4(140, 141, 142, 143);
23-
let _y8 = i32x8(180, 181, 182, 183, 184, 185, 186, 187);
21+
let _y2 = i32x2([120, 121]);
22+
let _y4 = i32x4([140, 141, 142, 143]);
23+
let _y8 = i32x8([180, 181, 182, 183, 184, 185, 186, 187]);
2424
}

0 commit comments

Comments
 (0)