Skip to content

Commit a5f5328

Browse files
TaKO8KiTaKO8Ki
authored
Rollup merge of rust-lang#111618 - cjgillot:name-return-place, r=tmiasko
Always name the return place. MIR opts more and more consider `_0` as just another local, so there is no point in keeping the special case in debug-info logic.
2 parents 90adbdc + 7e75612 commit a5f5328

23 files changed

+187
-191
lines changed

‎compiler/rustc_codegen_ssa/src/mir/debuginfo.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
327327

328328
let local_ref = &self.locals[local];
329329

330-
// FIXME Should the return place be named?
331-
let name = if bx.sess().fewer_names() || local == mir::RETURN_PLACE {
330+
let name = if bx.sess().fewer_names() {
332331
None
333332
} else {
334333
Some(match whole_local_var.or(fallback_var.clone()) {

‎tests/codegen/avr/avr-func-addrspace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ pub enum Either<T, U> { A(T), B(U) }
116116
// with the `ptr` field representing both `&i32` and `fn()` depending on the variant.
117117
// This is incorrect, because `fn()` should be `ptr addrspace(1)`, not `ptr`.
118118

119-
// CHECK: define{{.+}}void @should_not_combine_addrspace({{.+\*|ptr}}{{.+}}sret{{.+}}%0, {{.+\*|ptr}}{{.+}}%x)
119+
// CHECK: define{{.+}}void @should_not_combine_addrspace({{.+\*|ptr}}{{.+}}sret{{.+}}%_0, {{.+\*|ptr}}{{.+}}%x)
120120
#[no_mangle]
121121
#[inline(never)]
122122
pub fn should_not_combine_addrspace(x: Either<&i32, fn()>) -> Either<&i32, fn()> {

‎tests/codegen/consts.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// compile-flags: -C no-prepopulate-passes
2+
// min-llvm-version: 15.0 (for opaque pointers)
23

34
#![crate_type = "lib"]
45

@@ -42,14 +43,14 @@ pub fn inline_enum_const() -> E<i8, i16> {
4243
#[no_mangle]
4344
pub fn low_align_const() -> E<i16, [i16; 3]> {
4445
// Check that low_align_const and high_align_const use the same constant
45-
// CHECK: memcpy.{{.+}}({{i8\*|ptr}} align 2 %{{[0-9]+}}, {{i8\*|ptr}} align 2 {{.*}}[[LOW_HIGH]]{{.*}}, i{{(32|64)}} 8, i1 false)
46+
// CHECK: memcpy.{{.+}}(ptr align 2 %_0, ptr align 2 {{.*}}[[LOW_HIGH]]{{.*}}, i{{(32|64)}} 8, i1 false)
4647
*&E::A(0)
4748
}
4849

4950
// CHECK-LABEL: @high_align_const
5051
#[no_mangle]
5152
pub fn high_align_const() -> E<i16, i32> {
5253
// Check that low_align_const and high_align_const use the same constant
53-
// CHECK: memcpy.{{.+}}({{i8\*|ptr}} align 4 %{{[0-9]+}}, {{i8\*|ptr}} align 4 {{.*}}[[LOW_HIGH]]{{.*}}, i{{(32|64)}} 8, i1 false)
54+
// CHECK: memcpy.{{.+}}(ptr align 4 %_0, ptr align 4 {{.*}}[[LOW_HIGH]]{{.*}}, i{{(32|64)}} 8, i1 false)
5455
*&E::A(0)
5556
}

‎tests/codegen/enum-match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub enum Enum0 {
1515
// CHECK-NEXT: start:
1616
// CHECK-NEXT: %1 = icmp eq i8 %0, 2
1717
// CHECK-NEXT: %2 = and i8 %0, 1
18-
// CHECK-NEXT: %.0 = select i1 %1, i8 13, i8 %2
18+
// CHECK-NEXT: %_0.0 = select i1 %1, i8 13, i8 %2
1919
#[no_mangle]
2020
pub fn match0(e: Enum0) -> u8 {
2121
use Enum0::*;

‎tests/codegen/fewer-names.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ pub fn sum(x: u32, y: u32) -> u32 {
1313

1414
// NO-LABEL: define{{.*}}i32 @sum(i32 noundef %x, i32 noundef %y)
1515
// NO-NEXT: start:
16-
// NO-NEXT: %0 = add i32 %y, %x
17-
// NO-NEXT: ret i32 %0
16+
// NO-NEXT: %z = add i32 %y, %x
17+
// NO-NEXT: ret i32 %z
1818
let z = x + y;
1919
z
2020
}

‎tests/codegen/function-arguments-noopt.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub fn borrow_call(x: &i32, f: fn(&i32) -> &i32) -> &i32 {
4242
f(x)
4343
}
4444

45-
// CHECK: void @struct_({{%S\*|ptr}} sret(%S){{( %0)?}}, {{%S\*|ptr}} %x)
45+
// CHECK: void @struct_({{%S\*|ptr}} sret(%S){{( %_0)?}}, {{%S\*|ptr}} %x)
4646
#[no_mangle]
4747
pub fn struct_(x: S) -> S {
4848
x
@@ -51,7 +51,7 @@ pub fn struct_(x: S) -> S {
5151
// CHECK-LABEL: @struct_call
5252
#[no_mangle]
5353
pub fn struct_call(x: S, f: fn(S) -> S) -> S {
54-
// CHECK: call void %f({{%S\*|ptr}} sret(%S){{( %0)?}}, {{%S\*|ptr}} %{{.+}})
54+
// CHECK: call void %f({{%S\*|ptr}} sret(%S){{( %_0)?}}, {{%S\*|ptr}} %{{.+}})
5555
f(x)
5656
}
5757

‎tests/codegen/function-arguments.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ pub fn notunpin_box(x: Box<NotUnpin>) -> Box<NotUnpin> {
188188
x
189189
}
190190

191-
// CHECK: @struct_return({{%S\*|ptr}} noalias nocapture noundef sret(%S) dereferenceable(32){{( %0)?}})
191+
// CHECK: @struct_return({{%S\*|ptr}} noalias nocapture noundef sret(%S) dereferenceable(32){{( %_0)?}})
192192
#[no_mangle]
193193
pub fn struct_return() -> S {
194194
S {

‎tests/codegen/intrinsics/transmute-niched.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,16 @@ pub unsafe fn check_bool_from_ordering(x: std::cmp::Ordering) -> bool {
169169
// CHECK-LABEL: @check_bool_to_ordering(
170170
#[no_mangle]
171171
pub unsafe fn check_bool_to_ordering(x: bool) -> std::cmp::Ordering {
172-
// CHECK: %0 = zext i1 %x to i8
173-
// OPT: %1 = icmp ule i8 %0, 1
174-
// OPT: call void @llvm.assume(i1 %1)
175-
// OPT: %2 = icmp uge i8 %0, -1
176-
// OPT: %3 = icmp ule i8 %0, 1
177-
// OPT: %4 = or i1 %2, %3
178-
// OPT: call void @llvm.assume(i1 %4)
172+
// CHECK: %_0 = zext i1 %x to i8
173+
// OPT: %0 = icmp ule i8 %_0, 1
174+
// OPT: call void @llvm.assume(i1 %0)
175+
// OPT: %1 = icmp uge i8 %_0, -1
176+
// OPT: %2 = icmp ule i8 %_0, 1
177+
// OPT: %3 = or i1 %1, %2
178+
// OPT: call void @llvm.assume(i1 %3)
179179
// DBG-NOT: icmp
180180
// DBG-NOT: assume
181-
// CHECK: ret i8 %0
181+
// CHECK: ret i8 %_0
182182

183183
transmute(x)
184184
}

‎tests/codegen/intrinsics/transmute-x64.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@ use std::mem::transmute;
1111
#[no_mangle]
1212
pub unsafe fn check_sse_float_to_int(x: __m128) -> __m128i {
1313
// CHECK-NOT: alloca
14-
// CHECK: %1 = load <4 x float>, ptr %x, align 16
15-
// CHECK: store <4 x float> %1, ptr %0, align 16
14+
// CHECK: %0 = load <4 x float>, ptr %x, align 16
15+
// CHECK: store <4 x float> %0, ptr %_0, align 16
1616
transmute(x)
1717
}
1818

1919
// CHECK-LABEL: @check_sse_pair_to_avx(
2020
#[no_mangle]
2121
pub unsafe fn check_sse_pair_to_avx(x: (__m128i, __m128i)) -> __m256i {
2222
// CHECK-NOT: alloca
23-
// CHECK: %1 = load <4 x i64>, ptr %x, align 16
24-
// CHECK: store <4 x i64> %1, ptr %0, align 32
23+
// CHECK: %0 = load <4 x i64>, ptr %x, align 16
24+
// CHECK: store <4 x i64> %0, ptr %_0, align 32
2525
transmute(x)
2626
}
2727

2828
// CHECK-LABEL: @check_sse_pair_from_avx(
2929
#[no_mangle]
3030
pub unsafe fn check_sse_pair_from_avx(x: __m256i) -> (__m128i, __m128i) {
3131
// CHECK-NOT: alloca
32-
// CHECK: %1 = load <4 x i64>, ptr %x, align 32
33-
// CHECK: store <4 x i64> %1, ptr %0, align 16
32+
// CHECK: %0 = load <4 x i64>, ptr %x, align 32
33+
// CHECK: store <4 x i64> %0, ptr %_0, align 16
3434
transmute(x)
3535
}

‎tests/codegen/intrinsics/transmute.rs

+43-47
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#![feature(inline_const)]
99
#![allow(unreachable_code)]
1010

11-
use std::mem::MaybeUninit;
1211
use std::intrinsics::{transmute, transmute_unchecked};
12+
use std::mem::MaybeUninit;
1313

1414
// Some of these need custom MIR to not get removed by MIR optimizations.
1515
use std::intrinsics::mir::*;
@@ -63,7 +63,7 @@ pub unsafe fn check_to_empty_array(x: [u32; 5]) -> [u32; 0] {
6363
// CHECK-NOT: trap
6464
// CHECK: call void @llvm.trap
6565
// CHECK-NOT: trap
66-
mir!{
66+
mir! {
6767
{
6868
RET = CastTransmute(x);
6969
Return()
@@ -78,7 +78,7 @@ pub unsafe fn check_from_empty_array(x: [u32; 0]) -> [u32; 5] {
7878
// CHECK-NOT: trap
7979
// CHECK: call void @llvm.trap
8080
// CHECK-NOT: trap
81-
mir!{
81+
mir! {
8282
{
8383
RET = CastTransmute(x);
8484
Return()
@@ -93,7 +93,7 @@ pub unsafe fn check_to_uninhabited(x: u16) {
9393
// CHECK-NOT: trap
9494
// CHECK: call void @llvm.trap
9595
// CHECK-NOT: trap
96-
mir!{
96+
mir! {
9797
let temp: BigNever;
9898
{
9999
temp = CastTransmute(x);
@@ -107,7 +107,7 @@ pub unsafe fn check_to_uninhabited(x: u16) {
107107
#[custom_mir(dialect = "runtime", phase = "optimized")]
108108
pub unsafe fn check_from_uninhabited(x: BigNever) -> u16 {
109109
// CHECK: ret i16 poison
110-
mir!{
110+
mir! {
111111
{
112112
RET = CastTransmute(x);
113113
Return()
@@ -122,9 +122,7 @@ pub unsafe fn check_intermediate_passthrough(x: u32) -> i32 {
122122
// CHECK: %[[TMP:.+]] = add i32 1, %x
123123
// CHECK: %[[RET:.+]] = add i32 %[[TMP]], 1
124124
// CHECK: ret i32 %[[RET]]
125-
unsafe {
126-
transmute::<u32, i32>(1 + x) + 1
127-
}
125+
unsafe { transmute::<u32, i32>(1 + x) + 1 }
128126
}
129127

130128
// CHECK-LABEL: @check_nop_pair(
@@ -134,9 +132,7 @@ pub unsafe fn check_nop_pair(x: (u8, i8)) -> (i8, u8) {
134132
// CHECK: %0 = insertvalue { i8, i8 } poison, i8 %x.0, 0
135133
// CHECK: %1 = insertvalue { i8, i8 } %0, i8 %x.1, 1
136134
// CHECK: ret { i8, i8 } %1
137-
unsafe {
138-
transmute(x)
139-
}
135+
unsafe { transmute(x) }
140136
}
141137

142138
// CHECK-LABEL: @check_to_newtype(
@@ -168,9 +164,9 @@ pub unsafe fn check_aggregate_to_bool(x: Aggregate8) -> bool {
168164
// CHECK-LABEL: @check_aggregate_from_bool(
169165
#[no_mangle]
170166
pub unsafe fn check_aggregate_from_bool(x: bool) -> Aggregate8 {
171-
// CHECK: %0 = alloca %Aggregate8, align 1
167+
// CHECK: %_0 = alloca %Aggregate8, align 1
172168
// CHECK: %[[BYTE:.+]] = zext i1 %x to i8
173-
// CHECK: store i8 %[[BYTE]], ptr %0, align 1
169+
// CHECK: store i8 %[[BYTE]], ptr %_0, align 1
174170
transmute(x)
175171
}
176172

@@ -195,8 +191,8 @@ pub unsafe fn check_byte_from_bool(x: bool) -> u8 {
195191
// CHECK-LABEL: @check_to_pair(
196192
#[no_mangle]
197193
pub unsafe fn check_to_pair(x: u64) -> Option<i32> {
198-
// CHECK: %0 = alloca { i32, i32 }, align 4
199-
// CHECK: store i64 %x, ptr %0, align 4
194+
// CHECK: %_0 = alloca { i32, i32 }, align 4
195+
// CHECK: store i64 %x, ptr %_0, align 4
200196
transmute(x)
201197
}
202198

@@ -207,37 +203,37 @@ pub unsafe fn check_from_pair(x: Option<i32>) -> u64 {
207203
// immediates so we can write using the destination alloca's alignment.
208204
const { assert!(std::mem::align_of::<Option<i32>>() == 4) };
209205

210-
// CHECK: %0 = alloca i64, align 8
211-
// CHECK: store i32 %x.0, ptr %1, align 8
212-
// CHECK: store i32 %x.1, ptr %2, align 4
213-
// CHECK: %3 = load i64, ptr %0, align 8
214-
// CHECK: ret i64 %3
206+
// CHECK: %_0 = alloca i64, align 8
207+
// CHECK: store i32 %x.0, ptr %0, align 8
208+
// CHECK: store i32 %x.1, ptr %1, align 4
209+
// CHECK: %2 = load i64, ptr %_0, align 8
210+
// CHECK: ret i64 %2
215211
transmute(x)
216212
}
217213

218214
// CHECK-LABEL: @check_to_float(
219215
#[no_mangle]
220216
pub unsafe fn check_to_float(x: u32) -> f32 {
221217
// CHECK-NOT: alloca
222-
// CHECK: %0 = bitcast i32 %x to float
223-
// CHECK: ret float %0
218+
// CHECK: %_0 = bitcast i32 %x to float
219+
// CHECK: ret float %_0
224220
transmute(x)
225221
}
226222

227223
// CHECK-LABEL: @check_from_float(
228224
#[no_mangle]
229225
pub unsafe fn check_from_float(x: f32) -> u32 {
230226
// CHECK-NOT: alloca
231-
// CHECK: %0 = bitcast float %x to i32
232-
// CHECK: ret i32 %0
227+
// CHECK: %_0 = bitcast float %x to i32
228+
// CHECK: ret i32 %_0
233229
transmute(x)
234230
}
235231

236232
// CHECK-LABEL: @check_to_bytes(
237233
#[no_mangle]
238234
pub unsafe fn check_to_bytes(x: u32) -> [u8; 4] {
239-
// CHECK: %0 = alloca [4 x i8], align 1
240-
// CHECK: store i32 %x, ptr %0, align 1
235+
// CHECK: %_0 = alloca [4 x i8], align 1
236+
// CHECK: store i32 %x, ptr %_0, align 1
241237
transmute(x)
242238
}
243239

@@ -253,10 +249,10 @@ pub unsafe fn check_from_bytes(x: [u8; 4]) -> u32 {
253249
// CHECK-LABEL: @check_to_aggregate(
254250
#[no_mangle]
255251
pub unsafe fn check_to_aggregate(x: u64) -> Aggregate64 {
256-
// CHECK: %0 = alloca %Aggregate64, align 4
257-
// CHECK: store i64 %x, ptr %0, align 4
258-
// CHECK: %1 = load i64, ptr %0, align 4
259-
// CHECK: ret i64 %1
252+
// CHECK: %_0 = alloca %Aggregate64, align 4
253+
// CHECK: store i64 %x, ptr %_0, align 4
254+
// CHECK: %0 = load i64, ptr %_0, align 4
255+
// CHECK: ret i64 %0
260256
transmute(x)
261257
}
262258

@@ -273,7 +269,7 @@ pub unsafe fn check_from_aggregate(x: Aggregate64) -> u64 {
273269
#[no_mangle]
274270
pub unsafe fn check_long_array_less_aligned(x: [u64; 100]) -> [u16; 400] {
275271
// CHECK-NEXT: start
276-
// CHECK-NEXT: call void @llvm.memcpy.p0.p0.i64(ptr align 2 %0, ptr align 8 %x, i64 800, i1 false)
272+
// CHECK-NEXT: call void @llvm.memcpy.p0.p0.i64(ptr align 2 %_0, ptr align 8 %x, i64 800, i1 false)
277273
// CHECK-NEXT: ret void
278274
transmute(x)
279275
}
@@ -282,7 +278,7 @@ pub unsafe fn check_long_array_less_aligned(x: [u64; 100]) -> [u16; 400] {
282278
#[no_mangle]
283279
pub unsafe fn check_long_array_more_aligned(x: [u8; 100]) -> [u32; 25] {
284280
// CHECK-NEXT: start
285-
// CHECK-NEXT: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %0, ptr align 1 %x, i64 100, i1 false)
281+
// CHECK-NEXT: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %_0, ptr align 1 %x, i64 100, i1 false)
286282
// CHECK-NEXT: ret void
287283
transmute(x)
288284
}
@@ -301,8 +297,8 @@ pub unsafe fn check_pair_with_bool(x: (u8, bool)) -> (bool, i8) {
301297
pub unsafe fn check_float_to_pointer(x: f64) -> *const () {
302298
// CHECK-NOT: alloca
303299
// CHECK: %0 = bitcast double %x to i64
304-
// CHECK: %1 = inttoptr i64 %0 to ptr
305-
// CHECK: ret ptr %1
300+
// CHECK: %_0 = inttoptr i64 %0 to ptr
301+
// CHECK: ret ptr %_0
306302
transmute(x)
307303
}
308304

@@ -311,8 +307,8 @@ pub unsafe fn check_float_to_pointer(x: f64) -> *const () {
311307
pub unsafe fn check_float_from_pointer(x: *const ()) -> f64 {
312308
// CHECK-NOT: alloca
313309
// CHECK: %0 = ptrtoint ptr %x to i64
314-
// CHECK: %1 = bitcast i64 %0 to double
315-
// CHECK: ret double %1
310+
// CHECK: %_0 = bitcast i64 %0 to double
311+
// CHECK: ret double %_0
316312
transmute(x)
317313
}
318314

@@ -376,10 +372,10 @@ pub unsafe fn check_issue_110005(x: (usize, bool)) -> Option<Box<[u8]>> {
376372
// CHECK-LABEL: @check_pair_to_dst_ref(
377373
#[no_mangle]
378374
pub unsafe fn check_pair_to_dst_ref<'a>(x: (usize, usize)) -> &'a [u8] {
379-
// CHECK: %0 = inttoptr i64 %x.0 to ptr
380-
// CHECK: %1 = insertvalue { ptr, i64 } poison, ptr %0, 0
381-
// CHECK: %2 = insertvalue { ptr, i64 } %1, i64 %x.1, 1
382-
// CHECK: ret { ptr, i64 } %2
375+
// CHECK: %_0.0 = inttoptr i64 %x.0 to ptr
376+
// CHECK: %0 = insertvalue { ptr, i64 } poison, ptr %_0.0, 0
377+
// CHECK: %1 = insertvalue { ptr, i64 } %0, i64 %x.1, 1
378+
// CHECK: ret { ptr, i64 } %1
383379
transmute(x)
384380
}
385381

@@ -391,7 +387,7 @@ pub unsafe fn check_issue_109992(x: ()) -> [(); 1] {
391387

392388
// CHECK: start
393389
// CHECK-NEXT: ret void
394-
mir!{
390+
mir! {
395391
{
396392
RET = CastTransmute(x);
397393
Return()
@@ -408,7 +404,7 @@ pub unsafe fn check_unit_to_never(x: ()) {
408404
// CHECK-NOT: trap
409405
// CHECK: call void @llvm.trap
410406
// CHECK-NOT: trap
411-
mir!{
407+
mir! {
412408
let temp: ZstNever;
413409
{
414410
temp = CastTransmute(x);
@@ -425,7 +421,7 @@ pub unsafe fn check_unit_from_never(x: ZstNever) -> () {
425421

426422
// CHECK: start
427423
// CHECK-NEXT: ret void
428-
mir!{
424+
mir! {
429425
{
430426
RET = CastTransmute(x);
431427
Return()
@@ -457,10 +453,10 @@ pub struct HighAlignScalar(u8);
457453
// CHECK-LABEL: @check_to_overalign(
458454
#[no_mangle]
459455
pub unsafe fn check_to_overalign(x: u64) -> HighAlignScalar {
460-
// CHECK: %0 = alloca %HighAlignScalar, align 8
461-
// CHECK: store i64 %x, ptr %0, align 8
462-
// CHECK: %1 = load i64, ptr %0, align 8
463-
// CHECK: ret i64 %1
456+
// CHECK: %_0 = alloca %HighAlignScalar, align 8
457+
// CHECK: store i64 %x, ptr %_0, align 8
458+
// CHECK: %0 = load i64, ptr %_0, align 8
459+
// CHECK: ret i64 %0
464460
transmute(x)
465461
}
466462

0 commit comments

Comments
 (0)