Skip to content

Commit e03e8b1

Browse files
authored
Update enum-aggregate-riscv64.rs
Resolve rust-lang#143502 merge conflicts.
1 parent 0c9d378 commit e03e8b1

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

tests/codegen/enum/enum-aggregate-riscv64.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,14 @@ fn make_uninhabited_err_indirectly(n: Never) -> Result<u32, Never> {
113113

114114
#[no_mangle]
115115
fn make_fully_uninhabited_result(v: u32, n: Never) -> Result<(u32, Never), (Never, u32)> {
116-
// We don't try to do this in SSA form since the whole type is uninhabited.
116+
// Actually reaching this would be UB, so we don't actually build a result.
117117

118118
// CHECK-LABEL: { i32, i32 } @make_fully_uninhabited_result(i32 signext %v)
119-
// CHECK: %[[ALLOC_V:.+]] = alloca [4 x i8]
120-
// CHECK: %[[RET:.+]] = alloca [8 x i8]
121-
// CHECK: store i32 %v, ptr %[[ALLOC_V]]
122-
// CHECK: %[[TEMP_V:.+]] = load i32, ptr %[[ALLOC_V]]
123-
// CHECK: %[[INNER:.+]] = getelementptr inbounds i8, ptr %[[RET]]
124-
// CHECK: store i32 %[[TEMP_V]], ptr %[[INNER]]
125-
// CHECK: call void @llvm.trap()
126-
// CHECK: unreachable
119+
// CHECK-NEXT: start:
120+
// CHECK-NEXT: call void @llvm.trap()
121+
// CHECK-NEXT: call void @llvm.trap()
122+
// CHECK-NEXT: call void @llvm.trap()
123+
// CHECK-NEXT: unreachable
127124
Ok((v, n))
128125
}
129126

0 commit comments

Comments
 (0)