diff options
| author | kenta7777 <k.hasegw7@gmail.com> | 2018-09-11 22:18:49 +0900 |
|---|---|---|
| committer | kenta7777 <k.hasegw7@gmail.com> | 2018-09-11 22:18:49 +0900 |
| commit | 10b2083a6d3de2dad2a41639bfe5a90c4d87bf31 (patch) | |
| tree | 67fb119f88e98ba26d6862484b15fdf3e06c3d3c /src/librustc_codegen_llvm | |
| parent | d7ebc20e7783133310a65a1555465292fd5cd84e (diff) | |
| download | rust-10b2083a6d3de2dad2a41639bfe5a90c4d87bf31.tar.gz rust-10b2083a6d3de2dad2a41639bfe5a90c4d87bf31.zip | |
Revert "renamed is_nil to is_unit"
This reverts commit 6f685ffad42a2d12dd1fad5ccb0471e7fa260826.
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/debuginfo/type_names.rs | 2 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/mir/rvalue.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_codegen_llvm/debuginfo/type_names.rs b/src/librustc_codegen_llvm/debuginfo/type_names.rs index f9eb80a1988..95a094bf909 100644 --- a/src/librustc_codegen_llvm/debuginfo/type_names.rs +++ b/src/librustc_codegen_llvm/debuginfo/type_names.rs @@ -160,7 +160,7 @@ pub fn push_debuginfo_type_name<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>, output.push(')'); - if !sig.output().is_unit() { + if !sig.output().is_nil() { output.push_str(" -> "); push_debuginfo_type_name(cx, sig.output(), true, output); } diff --git a/src/librustc_codegen_llvm/mir/rvalue.rs b/src/librustc_codegen_llvm/mir/rvalue.rs index c3ec347f608..e301e5ae70b 100644 --- a/src/librustc_codegen_llvm/mir/rvalue.rs +++ b/src/librustc_codegen_llvm/mir/rvalue.rs @@ -566,7 +566,7 @@ impl FunctionCx<'a, 'll, 'tcx> { ) -> &'ll Value { let is_float = input_ty.is_fp(); let is_signed = input_ty.is_signed(); - let is_unit = input_ty.is_unit(); + let is_nil = input_ty.is_nil(); match op { mir::BinOp::Add => if is_float { bx.fadd(lhs, rhs) @@ -604,7 +604,7 @@ impl FunctionCx<'a, 'll, 'tcx> { mir::BinOp::Shl => common::build_unchecked_lshift(bx, lhs, rhs), mir::BinOp::Shr => common::build_unchecked_rshift(bx, input_ty, lhs, rhs), mir::BinOp::Ne | mir::BinOp::Lt | mir::BinOp::Gt | - mir::BinOp::Eq | mir::BinOp::Le | mir::BinOp::Ge => if is_unit { + mir::BinOp::Eq | mir::BinOp::Le | mir::BinOp::Ge => if is_nil { C_bool(bx.cx, match op { mir::BinOp::Ne | mir::BinOp::Lt | mir::BinOp::Gt => false, mir::BinOp::Eq | mir::BinOp::Le | mir::BinOp::Ge => true, |