diff options
| author | bors <bors@rust-lang.org> | 2018-06-16 21:48:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-16 21:48:31 +0000 |
| commit | ae46aefd5b682b4e4206b91df60760da8483b659 (patch) | |
| tree | 43da01618fd59e64294969b2f83005ec4638c0ed /src/librustc_codegen_llvm | |
| parent | b7e94a148d44c662b68781863dee83f97f4170af (diff) | |
| parent | 25c47a48858122b3b20a4a5f08ecbf13eb15e19d (diff) | |
| download | rust-ae46aefd5b682b4e4206b91df60760da8483b659.tar.gz rust-ae46aefd5b682b4e4206b91df60760da8483b659.zip | |
Auto merge of #51594 - eddyb:issue-51582, r=nagisa
rustc_codegen_llvm: don't treat i1 as signed, even for #[repr(i8)] enums. Fixes #51582. r? @nagisa cc @nox @oli-obk
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/mir/place.rs | 6 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/mir/rvalue.rs | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/mir/place.rs b/src/librustc_codegen_llvm/mir/place.rs index bda8c758750..2a1e3980adb 100644 --- a/src/librustc_codegen_llvm/mir/place.rs +++ b/src/librustc_codegen_llvm/mir/place.rs @@ -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) diff --git a/src/librustc_codegen_llvm/mir/rvalue.rs b/src/librustc_codegen_llvm/mir/rvalue.rs index d1b949d4f73..0fd81c6074e 100644 --- a/src/librustc_codegen_llvm/mir/rvalue.rs +++ b/src/librustc_codegen_llvm/mir/rvalue.rs @@ -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 |