]> git.lizzy.rs Git - rust.git/commitdiff
rustc_trans: do not attempt to truncate an i1 const to i1.
authorEduard-Mihai Burtescu <edy.burt@gmail.com>
Thu, 11 May 2017 21:14:31 +0000 (00:14 +0300)
committerEduard-Mihai Burtescu <edy.burt@gmail.com>
Thu, 11 May 2017 21:14:31 +0000 (00:14 +0300)
src/librustc_trans/mir/constant.rs
src/test/run-pass/issue-41744.rs [new file with mode: 0644]

index 040194e63d07e0ec6f549244ec495d3f3951abae..1305d6fff8cb027961923b75bee5252d0c4caa4f 100644 (file)
@@ -415,8 +415,11 @@ fn const_lvalue(&self, lvalue: &mir::Lvalue<'tcx>, span: Span)
                                           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)
diff --git a/src/test/run-pass/issue-41744.rs b/src/test/run-pass/issue-41744.rs
new file mode 100644 (file)
index 0000000..276067d
--- /dev/null
@@ -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];
+}