Commit 73476d4

committed

Auto merge of rust-lang#122849 - clubby789:no-metadata, r=petrochenkov

Don't emit load metadata in debug mode r? `@ghost`

2 parents 8b9e47c + b500693 commit 73476d4Copy full SHA for 73476d4

File tree

+20

-9

lines changed

compiler/rustc_codegen_llvm/src
- builder.rs
tests/codegen
- intrinsics
  - typed_swap.rs
- loads.rs
- overaligned-constant.rs

+20

-9

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ use rustc_middle::ty::layout::{`
`20`	`20`	`FnAbiError, FnAbiOfHelpers, FnAbiRequest, LayoutError, LayoutOfHelpers, TyAndLayout,`
`21`	`21`	`};`
`22`	`22`	`use rustc_middle::ty::{self, Instance, Ty, TyCtxt};`
	`23`	`+use rustc_session::config::OptLevel;`
`23`	`24`	`use rustc_span::Span;`
`24`	`25`	`use rustc_symbol_mangling::typeid::{`
`25`	`26`	`kcfi_typeid_for_fnabi, kcfi_typeid_for_instance, typeid_for_fnabi, typeid_for_instance,`
`@@ -551,6 +552,11 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {`
`551`	`552`	`layout: TyAndLayout<'tcx>,`
`552`	`553`	`offset: Size,`
`553`	`554`	`) {`
	`555`	`+ if bx.cx.sess().opts.optimize == OptLevel::No {`
	`556`	`+ // Don't emit metadata we're not going to use`
	`557`	`+ return;`
	`558`	`+ }`
	`559`	`+`
`554`	`560`	`if !scalar.is_uninit_valid() {`
`555`	`561`	`bx.noundef_metadata(load);`
`556`	`562`	`}`
`@@ -667,6 +673,11 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {`
`667`	`673`	`return;`
`668`	`674`	`}`
`669`	`675`
	`676`	`+ if self.cx.sess().opts.optimize == OptLevel::No {`
	`677`	`+ // Don't emit metadata we're not going to use`
	`678`	`+ return;`
	`679`	`+ }`
	`680`	`+`
`670`	`681`	`unsafe {`
`671`	`682`	`let llty = self.cx.val_ty(load);`
`672`	`683`	`let v = [`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,8 @@ pub unsafe fn swap_i32(x: &mut i32, y: &mut i32) {`
`24`	`24`	`// CHECK-NOT: alloca`
`25`	`25`
`26`	`26`	`// CHECK: %[[TEMP:.+]] = load i32, ptr %x, align 4`
`27`		`- // CHECK-SAME: !noundef`
	`27`	`+ // OPT3-SAME: !noundef`
`28`	`28`	`// OPT0: %[[TEMP2:.+]] = load i32, ptr %y, align 4`
`29`		`- // OPT0-SAME: !noundef`
`30`	`29`	`// OPT0: store i32 %[[TEMP2]], ptr %x, align 4`
`31`	`30`	`// OPT0-NOT: memcpy`
`32`	`31`	`// OPT3-NOT: load`
`@@ -42,9 +41,9 @@ pub unsafe fn swap_pair(x: &mut (i32, u32), y: &mut (i32, u32)) {`
`42`	`41`	`// CHECK-NOT: alloca`
`43`	`42`
`44`	`43`	`// CHECK: load i32`
`45`		`- // CHECK-SAME: !noundef`
	`44`	`+ // OPT3-SAME: !noundef`
`46`	`45`	`// CHECK: load i32`
`47`		`- // CHECK-SAME: !noundef`
	`46`	`+ // OPT3-SAME: !noundef`
`48`	`47`	`// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %x, ptr align 4 %y, i64 8, i1 false)`
`49`	`48`	`// CHECK: store i32`
`50`	`49`	`// CHECK: store i32`
`@@ -57,10 +56,10 @@ pub unsafe fn swap_str<'a>(x: &mut &'a str, y: &mut &'a str) {`
`57`	`56`	`// CHECK-NOT: alloca`
`58`	`57`
`59`	`58`	`// CHECK: load ptr`
`60`		`- // CHECK-SAME: !nonnull`
`61`		`- // CHECK-SAME: !noundef`
	`59`	`+ // OPT3-SAME: !nonnull`
	`60`	`+ // OPT3-SAME: !noundef`
`62`	`61`	`// CHECK: load i64`
`63`		`- // CHECK-SAME: !noundef`
	`62`	`+ // OPT3-SAME: !noundef`
`64`	`63`	`// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 %x, ptr align 8 %y, i64 16, i1 false)`
`65`	`64`	`// CHECK: store ptr`
`66`	`65`	`// CHECK: store i64`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-//@ compile-flags: -C no-prepopulate-passes -Zmir-opt-level=0`
	`1`	`+//@ compile-flags: -C no-prepopulate-passes -Zmir-opt-level=0 -O`
	`2`	`+`
`2`	`3`	`#![crate_type = "lib"]`
`3`	`4`	`#![feature(generic_nonzero)]`
`4`	`5`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ fn main() {`
`16`	`16`	`// CHECK-LABEL: @_ZN20overaligned_constant4main`
`17`	`17`	`// CHECK: [[full:%_.*]] = alloca %SmallStruct, align 8`
`18`	`18`	`// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[full]], ptr align 8 @0, i64 32, i1 false)`
`19`		`- // CHECK: %b.0 = load i32, ptr @0, align 4,`
	`19`	`+ // CHECK: %b.0 = load i32, ptr @0, align 4`
`20`	`20`	`// CHECK: %b.1 = load i32, ptr getelementptr inbounds ({{.*}}), align 4`
`21`	`21`	`let mut s = S(1);`
`22`	`22`

Comments

(0)