Skip to content

Commit

Permalink
Rollup merge of rust-lang#41923 - eddyb:issue-41744, r=arielb1
Browse files Browse the repository at this point in the history
rustc_trans: do not attempt to truncate an i1 const to i1.

Fixes rust-lang#41744 by skipping the truncation when it'd be a noop anyway.
  • Loading branch information
Mark-Simulacrum authored May 12, 2017
2 parents 8467fd6 + 68c1ce9 commit 11475b3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/librustc_trans/mir/constant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 16 additions & 0 deletions src/test/run-pass/issue-41744.rs
Original file line number Diff line number Diff line change
@@ -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];
}

0 comments on commit 11475b3

Please sign in to comment.