Auto merge of #38523 - camlorn:disable_field_reordering, r=nikomatsakis

Disable field reordering

This was decided via IRC and needs a backport to beta.  Basically, #37429 broke servo, and probably needs an announcement and opt-in flag.  I didn't run all tests locally but think I've already reverted all the ones that need to be reverted.

r? @nikomatsakis
This commit is contained in:
bors 2016-12-23 21:36:59 +00:00
commit 4d07320d01
5 changed files with 36 additions and 36 deletions

View file

@ -575,6 +575,10 @@ impl<'a, 'gcx, 'tcx> Struct {
});
}
// Disable field reordering until we can decide what to do.
// The odd pattern here avoids a warning about the value never being read.
if can_optimize { can_optimize = false }
let (optimize, sort_ascending) = match kind {
StructKind::AlwaysSizedUnivariant => (can_optimize, false),
StructKind::MaybeUnsizedUnivariant => (can_optimize, false),