about summary refs log tree commit diff
path: root/src/test/codegen
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-08-11 15:38:14 +0000
committerbors <bors@rust-lang.org>2020-08-11 15:38:14 +0000
commitcbe7c5ce705896d4e22bf6096590bc1f17993b78 (patch)
treedea646c83fccb7d18cff63570bf0c3eb03ae77ca /src/test/codegen
parent4b9ac5161781ca6a376daab3d3b2f2623d8f3789 (diff)
parent307d0d8f51e65d83274ff61072e15401ab852496 (diff)
downloadrust-cbe7c5ce705896d4e22bf6096590bc1f17993b78.tar.gz
rust-cbe7c5ce705896d4e22bf6096590bc1f17993b78.zip
Auto merge of #73656 - oli-obk:deaggregate-is-cleanup, r=wesleywiser
move Deaggregate pass to post_borrowck_cleanup

Reopen of #71946

Only the second commit is from this PR, the other commit is a bugfix that's in the process of getting merged. I'll rebase once that's done

In #70073 MIR pass handling got reorganized, but with the goal of not changing behavior (except for disabling some optimizations on opt-level = 0). But there we realized that the Deaggregator pass, while conceptually more of a "cleanup" pass (and one that should be run before optimizations), was run in the middle of the optimization chain. Likely this is an accident of history, so I suggest we try and clean that up by making it a proper cleanup pass.

This does change mir-opt output, because deaggregation now runs before const-prop instead of after.

r? @wesleywiser @rust-lang/wg-mir-opt

cc @RalfJung
Diffstat (limited to 'src/test/codegen')
-rw-r--r--src/test/codegen/consts.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/codegen/consts.rs b/src/test/codegen/consts.rs
index ed93af2f993..318f9b0eec3 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: @alloc7 = {{.*}}, align 2
+// CHECK: @alloc8 = {{.*}}, 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] }>* @alloc19, i32 0, i32 0, i32 0), {{.*}}
+// CHECK: [[LOW_HIGH:@[0-9]+]] = {{.*}} getelementptr inbounds (<{ [8 x i8] }>, <{ [8 x i8] }>* @alloc20, i32 0, i32 0, i32 0), {{.*}}
 
 #[derive(Copy, Clone)]
 // repr(i16) is required for the {low,high}_align_const test