about summary refs log tree commit diff
path: root/src/test/incremental
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2019-11-10 09:27:17 +0900
committerGitHub <noreply@github.com>2019-11-10 09:27:17 +0900
commitf16660943322d3fc3c4747eca6e757a3f7d60e50 (patch)
tree1736cc23b208dcbc1a48f1910311978ec720f0a4 /src/test/incremental
parentf135e3312f5a99fd28184546f6111100828e1720 (diff)
parent4505ff4badd0ffe137772401c39dfa760ff9d4a6 (diff)
downloadrust-f16660943322d3fc3c4747eca6e757a3f7d60e50.tar.gz
rust-f16660943322d3fc3c4747eca6e757a3f7d60e50.zip
Rollup merge of #66216 - wesleywiser:const_prop_codegen_improvements, r=oli-obk
[mir-opt] Handle return place in ConstProp and improve SimplifyLocals pass

Temporarily rebased on top of #66074. The top 2 commits are new.

r? @oli-obk
Diffstat (limited to 'src/test/incremental')
-rw-r--r--src/test/incremental/hashes/struct_constructors.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/incremental/hashes/struct_constructors.rs b/src/test/incremental/hashes/struct_constructors.rs
index 456d5e74751..7ae1798c7a2 100644
--- a/src/test/incremental/hashes/struct_constructors.rs
+++ b/src/test/incremental/hashes/struct_constructors.rs
@@ -152,7 +152,7 @@ pub fn change_constructor_path_regular_struct() {
 }
 
 #[cfg(not(cfail1))]
-#[rustc_clean(cfg="cfail2", except="HirBody,optimized_mir,mir_built,typeck_tables_of")]
+#[rustc_clean(cfg="cfail2", except="HirBody,mir_built,typeck_tables_of")]
 #[rustc_clean(cfg="cfail3")]
 pub fn change_constructor_path_regular_struct() {
     let _ = RegularStruct2 {
@@ -213,7 +213,7 @@ pub fn change_constructor_path_tuple_struct() {
 }
 
 #[cfg(not(cfail1))]
-#[rustc_clean(cfg="cfail2", except="HirBody,optimized_mir,mir_built,typeck_tables_of")]
+#[rustc_clean(cfg="cfail2", except="HirBody,mir_built,typeck_tables_of")]
 #[rustc_clean(cfg="cfail3")]
 pub fn change_constructor_path_tuple_struct() {
     let _ = TupleStruct2(0, 1, 2);