user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustc_mir: don't run the deaggregator on arrays for now.

Browse source
This commit is contained in:
Eduard-Mihai Burtescu 2018-02-14 16:10:25 +02:00
parent 6195ad8654
commit d773d95880
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc_mir/transform/deaggregator.rs
View file

@ -41,7 +41,11 @@ impl MirPass for Deaggregator {
let can_deaggregate = |statement: &Statement| {
if let StatementKind::Assign(_, ref rhs) = statement.kind {
if let Rvalue::Aggregate(..) = *rhs {
if let Rvalue::Aggregate(ref kind, _) = *rhs {
// FIXME(#48193) Deaggregate arrays when it's cheaper to do so.
if let AggregateKind::Array(_) = **kind {
return false;
}
return true;
}
}

3
src/test/mir-opt/deaggregator_test_multiple.rs
View file

@ -52,8 +52,7 @@ fn main() {
// ((_4 as A).0: i32) = move _5;
// discriminant(_4) = 0;
// ...
// _0[0 of 1] = move _2;
// _0[1 of 2] = move _4;
// _0 = [move _2, move _4];
// ...
// return;
// }