Skip to content

Commit 7fc5907

Browse files
borsbors
committed
Auto merge of rust-lang#116110 - matthiaskrgr:rollup-qx1bt8s, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang#115794 (Do not create a DerefLen place for `Box<[T]>`.) - rust-lang#116069 (Fix debug printing of tuple) - rust-lang#116075 (Document panics on unsigned wrapping_div/rem calls (rust-lang#116063)) - rust-lang#116076 (Add Zba, Zbb, and Zbs as target features for riscv64-linux-android) - rust-lang#116078 (Add assembly test to make sure that inlining works as expected when closures inherit target features) r? `@ghost` `@rustbot` modify labels: rollup
2 parents acfb46d + 6033e33 commit 7fc5907

14 files changed

+1041
-16
lines changed

‎compiler/rustc_mir_dataflow/src/value_analysis.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,9 @@ impl Map {
758758
self.value_count += 1;
759759
}
760760

761-
if let Some(ref_ty) = ty.builtin_deref(true) && let ty::Slice(..) = ref_ty.ty.kind() {
761+
if let ty::Ref(_, ref_ty, _) | ty::RawPtr(ty::TypeAndMut { ty: ref_ty, .. }) = ty.kind()
762+
&& let ty::Slice(..) = ref_ty.kind()
763+
{
762764
assert!(self.places[place].value_index.is_none(), "slices are not scalars");
763765

764766
// Prepend new child to the linked list.

‎compiler/rustc_target/src/spec/riscv64_linux_android.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub fn target() -> Target {
99
options: TargetOptions {
1010
code_model: Some(CodeModel::Medium),
1111
cpu: "generic-rv64".into(),
12-
features: "+m,+a,+f,+d,+c".into(),
12+
features: "+m,+a,+f,+d,+c,+Zba,+Zbb,+Zbs".into(),
1313
llvm_abiname: "lp64d".into(),
1414
supported_sanitizers: SanitizerSet::ADDRESS,
1515
max_atomic_width: Some(64),

‎compiler/rustc_type_ir/src/sty.rs

+10-14
Original file line numberDiff line numberDiff line change
@@ -531,22 +531,18 @@ impl<I: Interner> DebugWithInfcx<I> for TyKind<I> {
531531
}
532532
Never => write!(f, "!"),
533533
Tuple(t) => {
534-
let mut iter = t.clone().into_iter();
535-
536534
write!(f, "(")?;
537-
538-
match iter.next() {
539-
None => return write!(f, ")"),
540-
Some(ty) => write!(f, "{:?}", &this.wrap(ty))?,
541-
};
542-
543-
match iter.next() {
544-
None => return write!(f, ",)"),
545-
Some(ty) => write!(f, "{:?})", &this.wrap(ty))?,
535+
let mut count = 0;
536+
for ty in t.clone() {
537+
if count > 0 {
538+
write!(f, ", ")?;
539+
}
540+
write!(f, "{:?}", &this.wrap(ty))?;
541+
count += 1;
546542
}
547-
548-
for ty in iter {
549-
write!(f, ", {:?}", &this.wrap(ty))?;
543+
// unary tuples need a trailing comma
544+
if count == 1 {
545+
write!(f, ",")?;
550546
}
551547
write!(f, ")")
552548
}

‎library/core/src/num/uint_macros.rs

+16
Original file line numberDiff line numberDiff line change
@@ -1259,6 +1259,10 @@ macro_rules! uint_impl {
12591259
/// This function exists, so that all operations
12601260
/// are accounted for in the wrapping operations.
12611261
///
1262+
/// # Panics
1263+
///
1264+
/// This function will panic if `rhs` is 0.
1265+
///
12621266
/// # Examples
12631267
///
12641268
/// Basic usage:
@@ -1284,6 +1288,10 @@ macro_rules! uint_impl {
12841288
/// definitions of division are equal, this
12851289
/// is exactly equal to `self.wrapping_div(rhs)`.
12861290
///
1291+
/// # Panics
1292+
///
1293+
/// This function will panic if `rhs` is 0.
1294+
///
12871295
/// # Examples
12881296
///
12891297
/// Basic usage:
@@ -1307,6 +1315,10 @@ macro_rules! uint_impl {
13071315
/// This function exists, so that all operations
13081316
/// are accounted for in the wrapping operations.
13091317
///
1318+
/// # Panics
1319+
///
1320+
/// This function will panic if `rhs` is 0.
1321+
///
13101322
/// # Examples
13111323
///
13121324
/// Basic usage:
@@ -1333,6 +1345,10 @@ macro_rules! uint_impl {
13331345
/// definitions of division are equal, this
13341346
/// is exactly equal to `self.wrapping_rem(rhs)`.
13351347
///
1348+
/// # Panics
1349+
///
1350+
/// This function will panic if `rhs` is 0.
1351+
///
13361352
/// # Examples
13371353
///
13381354
/// Basic usage:

‎tests/assembly/closure-inherit-target-feature.rs

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
// only-x86_64
2+
// assembly-output: emit-asm
3+
// make sure the feature is not enabled at compile-time
4+
// compile-flags: -C target-feature=-sse4.1 -C llvm-args=-x86-asm-syntax=intel
5+
6+
#![feature(target_feature_11)]
7+
#![crate_type = "rlib"]
8+
9+
use std::arch::x86_64::{__m128, _mm_blend_ps};
10+
11+
#[no_mangle]
12+
pub unsafe fn sse41_blend_nofeature(x: __m128, y: __m128) -> __m128 {
13+
let f = {
14+
// check that _mm_blend_ps is not being inlined into the closure
15+
// CHECK-LABEL: {{sse41_blend_nofeature.*closure.*:}}
16+
// CHECK-NOT: blendps
17+
// CHECK: {{call .*_mm_blend_ps.*}}
18+
// CHECK-NOT: blendps
19+
// CHECK: ret
20+
#[inline(never)] |x, y| _mm_blend_ps(x, y, 0b0101)
21+
};
22+
f(x, y)
23+
}
24+
25+
#[target_feature(enable = "sse4.1")]
26+
pub fn sse41_blend_noinline(x: __m128, y: __m128) -> __m128 {
27+
let f = {
28+
// check that _mm_blend_ps is being inlined into the closure
29+
// CHECK-LABEL: {{sse41_blend_noinline.*closure.*:}}
30+
// CHECK-NOT: _mm_blend_ps
31+
// CHECK: blendps
32+
// CHECK-NOT: _mm_blend_ps
33+
// CHECK: ret
34+
#[inline(never)] |x, y| unsafe {
35+
_mm_blend_ps(x, y, 0b0101)
36+
}
37+
};
38+
f(x, y)
39+
}
40+
41+
#[no_mangle]
42+
#[target_feature(enable = "sse4.1")]
43+
pub fn sse41_blend_doinline(x: __m128, y: __m128) -> __m128 {
44+
// check that the closure and _mm_blend_ps are being inlined into the function
45+
// CHECK-LABEL: sse41_blend_doinline:
46+
// CHECK-NOT: {{sse41_blend_doinline.*closure.*}}
47+
// CHECK-NOT: _mm_blend_ps
48+
// CHECK: blendps
49+
// CHECK-NOT: {{sse41_blend_doinline.*closure.*}}
50+
// CHECK-NOT: _mm_blend_ps
51+
// CHECK: ret
52+
let f = {
53+
#[inline] |x, y| unsafe {
54+
_mm_blend_ps(x, y, 0b0101)
55+
}
56+
};
57+
f(x, y)
58+
}

‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.ConstProp.32bit.panic-abort.diff

+119
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
- // MIR for `main` before ConstProp
2+
+ // MIR for `main` after ConstProp
3+
4+
fn main() -> () {
5+
let mut _0: ();
6+
let _1: A;
7+
let mut _2: std::boxed::Box<[bool]>;
8+
scope 1 {
9+
debug a => _1;
10+
}
11+
scope 2 (inlined <Box<[bool]> as Default>::default) {
12+
let _3: std::ptr::Unique<[bool]>;
13+
let mut _4: std::ptr::Unique<[bool; 0]>;
14+
scope 3 {
15+
debug ptr => _3;
16+
}
17+
scope 4 (inlined Unique::<[bool; 0]>::dangling) {
18+
let mut _5: std::ptr::NonNull<[bool; 0]>;
19+
scope 5 (inlined NonNull::<[bool; 0]>::dangling) {
20+
let mut _7: usize;
21+
scope 6 {
22+
let _6: *mut [bool; 0];
23+
scope 7 {
24+
debug ptr => _6;
25+
scope 11 (inlined NonNull::<[bool; 0]>::new_unchecked) {
26+
debug ptr => _6;
27+
let mut _8: *const [bool; 0];
28+
scope 12 {
29+
scope 13 (inlined NonNull::<T>::new_unchecked::runtime::<[bool; 0]>) {
30+
debug ptr => _6;
31+
scope 14 (inlined ptr::mut_ptr::<impl *mut [bool; 0]>::is_null) {
32+
debug self => _6;
33+
let mut _9: *mut u8;
34+
scope 15 {
35+
scope 16 (inlined ptr::mut_ptr::<impl *mut T>::is_null::runtime_impl) {
36+
debug ptr => _9;
37+
scope 17 (inlined ptr::mut_ptr::<impl *mut u8>::addr) {
38+
debug self => _9;
39+
scope 18 {
40+
scope 19 (inlined ptr::mut_ptr::<impl *mut u8>::cast::<()>) {
41+
debug self => _9;
42+
}
43+
}
44+
}
45+
}
46+
}
47+
}
48+
}
49+
}
50+
}
51+
}
52+
scope 8 (inlined align_of::<[bool; 0]>) {
53+
}
54+
scope 9 (inlined invalid_mut::<[bool; 0]>) {
55+
debug addr => _7;
56+
scope 10 {
57+
}
58+
}
59+
}
60+
}
61+
}
62+
}
63+
64+
bb0: {
65+
StorageLive(_1);
66+
StorageLive(_2);
67+
StorageLive(_3);
68+
StorageLive(_4);
69+
StorageLive(_5);
70+
StorageLive(_6);
71+
StorageLive(_7);
72+
- _7 = AlignOf([bool; 0]);
73+
- _6 = _7 as *mut [bool; 0] (Transmute);
74+
+ _7 = const 1_usize;
75+
+ _6 = const {0x1 as *mut [bool; 0]};
76+
StorageDead(_7);
77+
StorageLive(_8);
78+
StorageLive(_9);
79+
- _8 = _6 as *const [bool; 0] (PointerCoercion(MutToConstPointer));
80+
- _5 = NonNull::<[bool; 0]> { pointer: _8 };
81+
+ _8 = const {0x1 as *const [bool; 0]};
82+
+ _5 = const NonNull::<[bool; 0]> {{ pointer: {0x1 as *const [bool; 0]} }};
83+
StorageDead(_9);
84+
StorageDead(_8);
85+
StorageDead(_6);
86+
- _4 = Unique::<[bool; 0]> { pointer: move _5, _marker: const PhantomData::<[bool; 0]> };
87+
+ _4 = const Unique::<[bool; 0]> {{ pointer: NonNull::<[bool; 0]> {{ pointer: {0x1 as *const [bool; 0]} }}, _marker: PhantomData::<[bool; 0]> }};
88+
StorageDead(_5);
89+
- _3 = move _4 as std::ptr::Unique<[bool]> (PointerCoercion(Unsize));
90+
+ _3 = const Unique::<[bool]> {{ pointer: NonNull::<[bool]> {{ pointer: Indirect { alloc_id: alloc7, offset: Size(0 bytes) }: *const [bool] }}, _marker: PhantomData::<[bool]> }};
91+
StorageDead(_4);
92+
- _2 = Box::<[bool]>(_3, const std::alloc::Global);
93+
+ _2 = const Box::<[bool]>(Unique::<[bool]> {{ pointer: NonNull::<[bool]> {{ pointer: Indirect { alloc_id: alloc10, offset: Size(0 bytes) }: *const [bool] }}, _marker: PhantomData::<[bool]> }}, std::alloc::Global);
94+
StorageDead(_3);
95+
- _1 = A { foo: move _2 };
96+
+ _1 = A { foo: const Box::<[bool]>(Unique::<[bool]> {{ pointer: NonNull::<[bool]> {{ pointer: Indirect { alloc_id: alloc11, offset: Size(0 bytes) }: *const [bool] }}, _marker: PhantomData::<[bool]> }}, std::alloc::Global) };
97+
StorageDead(_2);
98+
_0 = const ();
99+
drop(_1) -> [return: bb1, unwind unreachable];
100+
}
101+
102+
bb1: {
103+
StorageDead(_1);
104+
return;
105+
}
106+
+ }
107+
+
108+
+ alloc11 (size: 8, align: 4) {
109+
+ 01 00 00 00 00 00 00 00 │ ........
110+
+ }
111+
+
112+
+ alloc10 (size: 8, align: 4) {
113+
+ 01 00 00 00 00 00 00 00 │ ........
114+
+ }
115+
+
116+
+ alloc7 (size: 8, align: 4) {
117+
+ 01 00 00 00 00 00 00 00 │ ........
118+
}
119+

‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.ConstProp.32bit.panic-unwind.diff

+123
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
- // MIR for `main` before ConstProp
2+
+ // MIR for `main` after ConstProp
3+
4+
fn main() -> () {
5+
let mut _0: ();
6+
let _1: A;
7+
let mut _2: std::boxed::Box<[bool]>;
8+
scope 1 {
9+
debug a => _1;
10+
}
11+
scope 2 (inlined <Box<[bool]> as Default>::default) {
12+
let _3: std::ptr::Unique<[bool]>;
13+
let mut _4: std::ptr::Unique<[bool; 0]>;
14+
scope 3 {
15+
debug ptr => _3;
16+
}
17+
scope 4 (inlined Unique::<[bool; 0]>::dangling) {
18+
let mut _5: std::ptr::NonNull<[bool; 0]>;
19+
scope 5 (inlined NonNull::<[bool; 0]>::dangling) {
20+
let mut _7: usize;
21+
scope 6 {
22+
let _6: *mut [bool; 0];
23+
scope 7 {
24+
debug ptr => _6;
25+
scope 11 (inlined NonNull::<[bool; 0]>::new_unchecked) {
26+
debug ptr => _6;
27+
let mut _8: *const [bool; 0];
28+
scope 12 {
29+
scope 13 (inlined NonNull::<T>::new_unchecked::runtime::<[bool; 0]>) {
30+
debug ptr => _6;
31+
scope 14 (inlined ptr::mut_ptr::<impl *mut [bool; 0]>::is_null) {
32+
debug self => _6;
33+
let mut _9: *mut u8;
34+
scope 15 {
35+
scope 16 (inlined ptr::mut_ptr::<impl *mut T>::is_null::runtime_impl) {
36+
debug ptr => _9;
37+
scope 17 (inlined ptr::mut_ptr::<impl *mut u8>::addr) {
38+
debug self => _9;
39+
scope 18 {
40+
scope 19 (inlined ptr::mut_ptr::<impl *mut u8>::cast::<()>) {
41+
debug self => _9;
42+
}
43+
}
44+
}
45+
}
46+
}
47+
}
48+
}
49+
}
50+
}
51+
}
52+
scope 8 (inlined align_of::<[bool; 0]>) {
53+
}
54+
scope 9 (inlined invalid_mut::<[bool; 0]>) {
55+
debug addr => _7;
56+
scope 10 {
57+
}
58+
}
59+
}
60+
}
61+
}
62+
}
63+
64+
bb0: {
65+
StorageLive(_1);
66+
StorageLive(_2);
67+
StorageLive(_3);
68+
StorageLive(_4);
69+
StorageLive(_5);
70+
StorageLive(_6);
71+
StorageLive(_7);
72+
- _7 = AlignOf([bool; 0]);
73+
- _6 = _7 as *mut [bool; 0] (Transmute);
74+
+ _7 = const 1_usize;
75+
+ _6 = const {0x1 as *mut [bool; 0]};
76+
StorageDead(_7);
77+
StorageLive(_8);
78+
StorageLive(_9);
79+
- _8 = _6 as *const [bool; 0] (PointerCoercion(MutToConstPointer));
80+
- _5 = NonNull::<[bool; 0]> { pointer: _8 };
81+
+ _8 = const {0x1 as *const [bool; 0]};
82+
+ _5 = const NonNull::<[bool; 0]> {{ pointer: {0x1 as *const [bool; 0]} }};
83+
StorageDead(_9);
84+
StorageDead(_8);
85+
StorageDead(_6);
86+
- _4 = Unique::<[bool; 0]> { pointer: move _5, _marker: const PhantomData::<[bool; 0]> };
87+
+ _4 = const Unique::<[bool; 0]> {{ pointer: NonNull::<[bool; 0]> {{ pointer: {0x1 as *const [bool; 0]} }}, _marker: PhantomData::<[bool; 0]> }};
88+
StorageDead(_5);
89+
- _3 = move _4 as std::ptr::Unique<[bool]> (PointerCoercion(Unsize));
90+
+ _3 = const Unique::<[bool]> {{ pointer: NonNull::<[bool]> {{ pointer: Indirect { alloc_id: alloc7, offset: Size(0 bytes) }: *const [bool] }}, _marker: PhantomData::<[bool]> }};
91+
StorageDead(_4);
92+
- _2 = Box::<[bool]>(_3, const std::alloc::Global);
93+
+ _2 = const Box::<[bool]>(Unique::<[bool]> {{ pointer: NonNull::<[bool]> {{ pointer: Indirect { alloc_id: alloc10, offset: Size(0 bytes) }: *const [bool] }}, _marker: PhantomData::<[bool]> }}, std::alloc::Global);
94+
StorageDead(_3);
95+
- _1 = A { foo: move _2 };
96+
+ _1 = A { foo: const Box::<[bool]>(Unique::<[bool]> {{ pointer: NonNull::<[bool]> {{ pointer: Indirect { alloc_id: alloc11, offset: Size(0 bytes) }: *const [bool] }}, _marker: PhantomData::<[bool]> }}, std::alloc::Global) };
97+
StorageDead(_2);
98+
_0 = const ();
99+
drop(_1) -> [return: bb1, unwind: bb2];
100+
}
101+
102+
bb1: {
103+
StorageDead(_1);
104+
return;
105+
}
106+
107+
bb2 (cleanup): {
108+
resume;
109+
}
110+
+ }
111+
+
112+
+ alloc11 (size: 8, align: 4) {
113+
+ 01 00 00 00 00 00 00 00 │ ........
114+
+ }
115+
+
116+
+ alloc10 (size: 8, align: 4) {
117+
+ 01 00 00 00 00 00 00 00 │ ........
118+
+ }
119+
+
120+
+ alloc7 (size: 8, align: 4) {
121+
+ 01 00 00 00 00 00 00 00 │ ........
122+
}
123+

0 commit comments

Comments
 (0)