Rollup merge of #50393 - oli-obk:packed_const_panic, r=eddyb

Allow unaligned reads in constants

fixes #50356

introduced in https://github.com/rust-lang/rust/pull/49513
This commit is contained in:
kennytm 2018-05-03 16:11:32 +08:00
commit 46bc2c28b9
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
3 changed files with 30 additions and 4 deletions

View File

@ -792,7 +792,7 @@ impl<'a, 'tcx> PatternContext<'a, 'tcx> {
ConstVal::Value(miri) => const_val_field(
self.tcx, self.param_env, instance,
variant_opt, field, miri, cv.ty,
).unwrap(),
).expect("field access failed"),
_ => bug!("{:#?} is not a valid adt", cv),
};
self.const_to_pat(instance, val, id, span)

View File

@ -1340,9 +1340,7 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M
use syntax::ast::FloatTy;
let layout = self.layout_of(ty)?;
// do the strongest layout check of the two
let align = layout.align.max(ptr_align);
self.memory.check_align(ptr, align)?;
self.memory.check_align(ptr, ptr_align)?;
if layout.size.bytes() == 0 {
return Ok(Some(Value::ByVal(PrimVal::Undef)));

View File

@ -0,0 +1,28 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// compile-pass
#[derive(Copy, Clone, PartialEq, Eq)]
#[repr(packed)]
pub struct Num(u64);
impl Num {
pub const ZERO: Self = Num(0);
}
pub fn decrement(a: Num) -> Num {
match a {
Num::ZERO => Num::ZERO,
a => Num(a.0 - 1)
}
}
fn main() {
}