bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Address PR feedback

Browse source
This commit is contained in:
Scott McMurray 2025-04-07 18:12:06 -07:00
parent 51e67e21cf
commit 502f7f9c24
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_codegen_ssa/src/mir/operand.rs
View file

@ -581,7 +581,9 @@ impl<'a, 'tcx, V: CodegenObject> OperandRef<'tcx, V> {
); );
// In principle we could insert assumes on the possible range of `discr`, but // In principle we could insert assumes on the possible range of `discr`, but
// currently in LLVM this seems to be a pessimization. // currently in LLVM this isn't worth it because the original `tag` will
// have either a `range` parameter attribute or `!range` metadata,
// or come from a `transmute` that already `assume`d it.
discr discr
} }

16
tests/codegen/enum/enum-two-variants-match.rs
View file

@ -3,6 +3,10 @@
#![crate_type = "lib"] #![crate_type = "lib"]
// This directly tests what we emit for these matches, rather than what happens
// after optimization, so it doesn't need to worry about extra flags on the
// instructions and is less susceptible to being broken on LLVM updates.
// CHECK-LABEL: @option_match // CHECK-LABEL: @option_match
#[no_mangle] #[no_mangle]
pub fn option_match(x: Option<i32>) -> u16 { pub fn option_match(x: Option<i32>) -> u16 {
@ -103,10 +107,22 @@ pub fn option_ordering_match(x: Option<Ordering>) -> char {
// CHECK-LABEL: @option_nonzero_match( // CHECK-LABEL: @option_nonzero_match(
#[no_mangle] #[no_mangle]
pub fn option_nonzero_match(x: Option<std::num::NonZero<u16>>) -> u16 { pub fn option_nonzero_match(x: Option<std::num::NonZero<u16>>) -> u16 {
// CHECK: %[[OUT:.+]] = alloca [2 x i8]
// CHECK: %[[IS_NONE:.+]] = icmp eq i16 %x, 0 // CHECK: %[[IS_NONE:.+]] = icmp eq i16 %x, 0
// CHECK: %[[OPT_DISCR:.+]] = select i1 %[[IS_NONE]], i64 0, i64 1 // CHECK: %[[OPT_DISCR:.+]] = select i1 %[[IS_NONE]], i64 0, i64 1
// CHECK: %[[OPT_DISCR_T:.+]] = trunc nuw i64 %[[OPT_DISCR]] to i1 // CHECK: %[[OPT_DISCR_T:.+]] = trunc nuw i64 %[[OPT_DISCR]] to i1
// CHECK: br i1 %[[OPT_DISCR_T]], label %[[BB_SOME:.+]], label %[[BB_NONE:.+]] // CHECK: br i1 %[[OPT_DISCR_T]], label %[[BB_SOME:.+]], label %[[BB_NONE:.+]]
// CHECK: [[BB_SOME]]:
// CHECK: store i16 987, ptr %[[OUT]]
// CHECK: [[BB_NONE]]:
// CHECK: store i16 123, ptr %[[OUT]]
// CHECK: %[[RET:.+]] = load i16, ptr %[[OUT]]
// CHECK: ret i16 %[[RET]]
match x { match x {
None => 123, None => 123,
Some(_) => 987, Some(_) => 987,