diff options
| author | bors <bors@rust-lang.org> | 2020-04-23 14:40:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-23 14:40:20 +0000 |
| commit | 413a12909f3b149af17d75268ed4a136afb82c36 (patch) | |
| tree | 8e0197c08f480cf9e67e32e05b25afa61fe043c8 /src/test/codegen | |
| parent | 66f7a5d92f5adb9053bf66e0bf8f6d31d404870d (diff) | |
| parent | 47e2687a4eaf190ebd7eebdee7c32e839a6f14cf (diff) | |
| download | rust-413a12909f3b149af17d75268ed4a136afb82c36.tar.gz rust-413a12909f3b149af17d75268ed4a136afb82c36.zip | |
Auto merge of #71467 - Dylan-DPC:rollup-d1os8ug, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #71005 (Reading from the return place is fine) - #71198 (Const check/promotion cleanup and sanity assertion) - #71396 (Improve E0308 error message wording again) - #71452 (Remove outdated reference to interpreter snapshotting) - #71454 (Inline some function docs in `core::ptr`) - #71461 (Improve E0567 explanation) Failed merges: r? @ghost
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/consts.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/codegen/consts.rs b/src/test/codegen/consts.rs index e53e75b339b..ed93af2f993 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: @alloc5 = {{.*}}, align 2 +// CHECK: @alloc7 = {{.*}}, 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] }>* @alloc15, i32 0, i32 0, i32 0), {{.*}} +// CHECK: [[LOW_HIGH:@[0-9]+]] = {{.*}} getelementptr inbounds (<{ [8 x i8] }>, <{ [8 x i8] }>* @alloc19, i32 0, i32 0, i32 0), {{.*}} #[derive(Copy, Clone)] // repr(i16) is required for the {low,high}_align_const test |