OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #41923 - eddyb:issue-41744, r=arielb1

Browse Source 
rustc_trans: do not attempt to truncate an i1 const to i1.

Fixes #41744 by skipping the truncation when it'd be a noop anyway.
This commit is contained in:
Mark Simulacrum 2017-05-12 18:57:33 -06:00 committed by GitHub
commit cf4fac6ec5
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librustc_trans/mir/constant.rs
View File

@ -415,8 +415,11 @@ impl<'a, 'tcx> MirConstContext<'a, 'tcx> {
Value(base));
}
if projected_ty.is_bool() {
unsafe {
val = llvm::LLVMConstTrunc(val, Type::i1(self.ccx).to_ref());
let i1_type = Type::i1(self.ccx);
if val_ty(val) != i1_type {
unsafe {
val = llvm::LLVMConstTrunc(val, i1_type.to_ref());
}
}
}
(Base::Value(val), extra)

16
src/test/run-pass/issue-41744.rs Normal file
View File

@ -0,0 +1,16 @@
// Copyright 2017 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.
trait Tc {}
impl Tc for bool {}
fn main() {
let _: &[&Tc] = &[&true];
}