Skip to content

rustc_codegen_llvm: don't treat i1 as signed, even for #[repr(i8)] enums. #51594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/librustc_codegen_llvm/mir/place.rs
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,11 @@ impl<'a, 'tcx> PlaceRef<'tcx> {
layout::Variants::Single { .. } => bug!(),
layout::Variants::Tagged { ref tag, .. } => {
let signed = match tag.value {
layout::Int(_, signed) => signed,
// We use `i1` for bytes that are always `0` or `1`,
// e.g. `#[repr(i8)] enum E { A, B }`, but we can't
// let LLVM interpret the `i1` as signed, because
// then `i1 1` (i.e. E::B) is effectively `i8 -1`.
layout::Int(_, signed) => !tag.is_bool() && signed,
_ => false
};
bx.intcast(lldiscr, cast_to, signed)
Expand Down
6 changes: 5 additions & 1 deletion src/librustc_codegen_llvm/mir/rvalue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,11 @@ impl<'a, 'tcx> FunctionCx<'a, 'tcx> {
let mut signed = false;
if let layout::Abi::Scalar(ref scalar) = operand.layout.abi {
if let layout::Int(_, s) = scalar.value {
signed = s;
// We use `i1` for bytes that are always `0` or `1`,
// e.g. `#[repr(i8)] enum E { A, B }`, but we can't
// let LLVM interpret the `i1` as signed, because
// then `i1 1` (i.e. E::B) is effectively `i8 -1`.
signed = !scalar.is_bool() && s;

if scalar.valid_range.end() > scalar.valid_range.start() {
// We want `table[e as usize]` to not
Expand Down
27 changes: 27 additions & 0 deletions src/test/run-pass/issue-51582.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2018 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.

#![feature(core_intrinsics)]

#[repr(i8)]
pub enum Enum {
VariantA,
VariantB,
}

fn make_b() -> Enum { Enum::VariantB }

fn main() {
assert_eq!(1, make_b() as i8);
assert_eq!(1, make_b() as u8);
assert_eq!(1, make_b() as i32);
assert_eq!(1, make_b() as u32);
assert_eq!(1, unsafe { std::intrinsics::discriminant_value(&make_b()) });
}