diff options
| author | bors <bors@rust-lang.org> | 2019-02-24 06:59:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-24 06:59:13 +0000 |
| commit | e17c48e2f21eefd59748e364234efc7037a3ec96 (patch) | |
| tree | a989c587e29193df64c07d603037060b3dcefc6b /src/librustc_codegen_llvm | |
| parent | 7cb3ee453b829a513749eb49e6cbe7fe4da527b1 (diff) | |
| parent | f01ebc56dc9000f0f6507121e6702f83c2b8d2e2 (diff) | |
| download | rust-e17c48e2f21eefd59748e364234efc7037a3ec96.tar.gz rust-e17c48e2f21eefd59748e364234efc7037a3ec96.zip | |
Auto merge of #58691 - Centril:rollup, r=Centril
Rollup of 6 pull requests Successful merges: - #57364 (Improve parsing diagnostic for negative supertrait bounds) - #58183 (Clarify guarantees for `Box` allocation) - #58442 (Simplify the unix `Weak` functionality) - #58454 (Refactor Windows stdio and remove stdin double buffering ) - #58511 (Const to op simplification) - #58642 (rustdoc: support methods on primitives in intra-doc links) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/consts.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_llvm/consts.rs b/src/librustc_codegen_llvm/consts.rs index 6232d44df5e..4c88d4f0e63 100644 --- a/src/librustc_codegen_llvm/consts.rs +++ b/src/librustc_codegen_llvm/consts.rs @@ -71,7 +71,7 @@ pub fn codegen_static_initializer( let static_ = cx.tcx.const_eval(param_env.and(cid))?; let alloc = match static_.val { - ConstValue::ByRef(_, alloc, n) if n.bytes() == 0 => alloc, + ConstValue::ByRef(ptr, alloc) if ptr.offset.bytes() == 0 => alloc, _ => bug!("static const eval returned {:#?}", static_), }; Ok((const_alloc_to_llvm(cx, alloc), alloc)) |