Skip to content
Permalink
Browse files

Pacify tidy

  • Loading branch information...
oli-obk committed Jun 19, 2019
1 parent cdf5596 commit 3dfe017dc3fccca64d67973be10e4bbd3e90c966
Showing with 9 additions and 6 deletions.
  1. +6 −5 src/librustc/mir/interpret/value.rs
  2. +3 −1 src/librustc_codegen_llvm/consts.rs
@@ -45,11 +45,12 @@ pub enum ConstValue<'tcx> {

/// An value not represented/representable by `Scalar` or `Slice`
ByRef {
/// The alignment exists to allow `const_field` to have `ByRef` access to nonprimitive fields
/// of `repr(packed)` structs. The alignment may be lower than the type of this constant.
/// This permits reads with lower alignment than what the type would normally require.
/// FIXME(RalfJ,oli-obk): The alignment checks are part of miri, but const eval doesn't really
/// need them. Disabling them may be too hard though.
/// The alignment exists to allow `const_field` to have `ByRef` access to nonprimitive
/// fields of `repr(packed)` structs. The alignment may be lower than the type of this
/// constant. This permits reads with lower alignment than what the type would normally
/// require.
/// FIXME(RalfJ,oli-obk): The alignment checks are part of miri, but const eval doesn't
/// really need them. Disabling them may be too hard though.
align: Align,
/// Offset into `alloc`
offset: Size,
@@ -71,7 +71,9 @@ pub fn codegen_static_initializer(
let static_ = cx.tcx.const_eval(param_env.and(cid))?;

let alloc = match static_.val {
ConstValue::ByRef { offset, align, alloc } if offset.bytes() == 0 && align == alloc.align => {
ConstValue::ByRef {
offset, align, alloc,
} if offset.bytes() == 0 && align == alloc.align => {
alloc
},
_ => bug!("static const eval returned {:#?}", static_),

0 comments on commit 3dfe017

Please sign in to comment.
You can’t perform that action at this time.