diff options
| author | bors <bors@rust-lang.org> | 2020-03-13 16:10:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-13 16:10:20 +0000 |
| commit | d6072319a9fbeffea2ebe803ddaedbcf566ab5dd (patch) | |
| tree | 06038cab8de17d002d67d7be037bc1486042b21e /src/test/codegen | |
| parent | 54b7d21f59a363e53eb1c31d76b40af2ff99321c (diff) | |
| parent | cf929f77bffc9786fa7c15e75be7599cfc551225 (diff) | |
| download | rust-d6072319a9fbeffea2ebe803ddaedbcf566ab5dd.tar.gz rust-d6072319a9fbeffea2ebe803ddaedbcf566ab5dd.zip | |
Auto merge of #69155 - chrissimpkins:llvm-globals, r=eddyb
Add support for LLVM globals corresponding to miri allocations should be named alloc123 Adds support for this request from @eddyb in #69134: > That is, if -Zfewer-names is false (usually only because of --emit=llvm-ir), we should use the same name for LLVM globals we generate out of miri allocs as #67133 does in MIR output (allocN). > >This way, we can easily see the mapping between MIR and LLVM IR (and it shouldn't be any costlier for regular compilation, which would continue to use unnamed globals). r? @eddyb cc @oli-obk
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/consts.rs | 4 | ||||
| -rw-r--r-- | src/test/codegen/remap_path_prefix/main.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/codegen/consts.rs b/src/test/codegen/consts.rs index a89ecdfd3a9..e53e75b339b 100644 --- a/src/test/codegen/consts.rs +++ b/src/test/codegen/consts.rs @@ -10,11 +10,11 @@ // CHECK: @STATIC = {{.*}}, align 4 // This checks the constants from inline_enum_const -// CHECK: @{{[0-9]+}} = {{.*}}, align 2 +// CHECK: @alloc5 = {{.*}}, align 2 // This checks the constants from {low,high}_align_const, they share the same // constant, but the alignment differs, so the higher one should be used -// CHECK: [[LOW_HIGH:@[0-9]+]] = {{.*}} getelementptr inbounds (<{ [8 x i8] }>, <{ [8 x i8] }>* @2, i32 0, i32 0, i32 0), {{.*}}, +// CHECK: [[LOW_HIGH:@[0-9]+]] = {{.*}} getelementptr inbounds (<{ [8 x i8] }>, <{ [8 x i8] }>* @alloc15, i32 0, i32 0, i32 0), {{.*}} #[derive(Copy, Clone)] // repr(i16) is required for the {low,high}_align_const test diff --git a/src/test/codegen/remap_path_prefix/main.rs b/src/test/codegen/remap_path_prefix/main.rs index 52ffb97a5b2..4724dc3c3e5 100644 --- a/src/test/codegen/remap_path_prefix/main.rs +++ b/src/test/codegen/remap_path_prefix/main.rs @@ -12,7 +12,7 @@ mod aux_mod; include!("aux_mod.rs"); // Here we check that the expansion of the file!() macro is mapped. -// CHECK: @0 = private unnamed_addr constant <{ [34 x i8] }> <{ [34 x i8] c"/the/src/remap_path_prefix/main.rs" }>, align 1 +// CHECK: @alloc1 = private unnamed_addr constant <{ [34 x i8] }> <{ [34 x i8] c"/the/src/remap_path_prefix/main.rs" }>, align 1 pub static FILE_PATH: &'static str = file!(); fn main() { |