rustc_trans: check for layout::I1 instead of TyBool.

Author: eddyb

src/librustc_trans/abi.rs

@@ -695,17 +695,15 @@ impl<'a, 'tcx> FnType<'tcx> {
 
         let arg_of = |ty: Ty<'tcx>, is_return: bool| {
             let mut arg = ArgType::new(ccx.layout_of(ty));
-            if ty.is_bool() {
+            if let layout::Abi::Scalar(layout::Int(layout::I1, _)) = arg.layout.abi {
                 arg.attrs.set(ArgAttribute::ZExt);
-            } else {
-                if arg.layout.is_zst() {
-                    // For some forsaken reason, x86_64-pc-windows-gnu
-                    // doesn't ignore zero-sized struct arguments.
-                    // The same is true for s390x-unknown-linux-gnu.
-                    if is_return || rust_abi ||
-                       (!win_x64_gnu && !linux_s390x) {
-                        arg.ignore();
-                    }
+            } else if arg.layout.is_zst() {
+                // For some forsaken reason, x86_64-pc-windows-gnu
+                // doesn't ignore zero-sized struct arguments.
+                // The same is true for s390x-unknown-linux-gnu.
+                if is_return || rust_abi ||
+                    (!win_x64_gnu && !linux_s390x) {
+                    arg.ignore();
                 }
             }
             arg

src/librustc_trans/mir/block.rs

@@ -12,7 +12,7 @@ use llvm::{self, ValueRef, BasicBlockRef};
 use rustc::middle::lang_items;
 use rustc::middle::const_val::{ConstEvalErr, ConstInt, ErrKind};
 use rustc::ty::{self, TypeFoldable};
-use rustc::ty::layout::LayoutOf;
+use rustc::ty::layout::{self, LayoutOf};
 use rustc::traits;
 use rustc::mir;
 use abi::{Abi, FnType, ArgType};
@@ -673,7 +673,7 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> {
             } else {
                 llval = bcx.load(llval, align.non_abi());
             }
-            if arg.layout.ty == bcx.tcx().types.bool {
+            if let layout::Abi::Scalar(layout::Int(layout::I1, _)) = arg.layout.abi {
                 bcx.range_metadata(llval, 0..2);
                 // We store bools as i8 so we need to truncate to i1.
                 llval = base::to_immediate(bcx, llval, arg.layout);

src/librustc_trans/mir/constant.rs

@@ -454,7 +454,8 @@ impl<'a, 'tcx> MirConstContext<'a, 'tcx> {
                                 span_bug!(span, "dereference of non-constant pointer `{:?}`",
                                           Value(base));
                             }
-                            if projected_ty.is_bool() {
+                            let layout = self.ccx.layout_of(projected_ty);
+                            if let layout::Abi::Scalar(layout::Int(layout::I1, _)) = layout.abi {
                                 let i1_type = Type::i1(self.ccx);
                                 if val_ty(val) != i1_type {
                                     unsafe {