Skip to content

Commit 4fbec9f

Browse files
authored
[CIR] Backport AbstractConditionalOperator for ComplexType (#1821)
Backport AbstractConditionalOperator for ComplexType from the upstream Fix: #1788
1 parent abcff7b commit 4fbec9f

File tree

2 files changed

+53
-2
lines changed

2 files changed

+53
-2
lines changed

clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,24 @@ class ComplexExprEmitter : public StmtVisitor<ComplexExprEmitter, mlir::Value> {
310310
}
311311

312312
mlir::Value
313-
VisitAbstractConditionalOperator(const AbstractConditionalOperator *CO) {
314-
llvm_unreachable("NYI");
313+
VisitAbstractConditionalOperator(const AbstractConditionalOperator *E) {
314+
mlir::Value condValue = Visit(E->getCond());
315+
mlir::Location loc = CGF.getLoc(E->getSourceRange());
316+
317+
return Builder
318+
.create<cir::TernaryOp>(
319+
loc, condValue,
320+
/*thenBuilder=*/
321+
[&](mlir::OpBuilder &b, mlir::Location loc) {
322+
mlir::Value trueValue = Visit(E->getTrueExpr());
323+
b.create<cir::YieldOp>(loc, trueValue);
324+
},
325+
/*elseBuilder=*/
326+
[&](mlir::OpBuilder &b, mlir::Location loc) {
327+
mlir::Value falseValue = Visit(E->getFalseExpr());
328+
b.create<cir::YieldOp>(loc, falseValue);
329+
})
330+
.getResult();
315331
}
316332

317333
mlir::Value VisitChooseExpr(ChooseExpr *CE) {

clang/test/CIR/CodeGen/complex.cpp

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,38 @@ void complex_functional_cast() {
1414

1515
// LLVM: %[[INIT:.*]] = alloca { i32, i32 }, i64 1, align 4
1616
// LLVM: store { i32, i32 } zeroinitializer, ptr %[[INIT]], align 4
17+
18+
void complex_abstract_condition(bool cond, int _Complex a, int _Complex b) {
19+
int _Complex c = cond ? a : b;
20+
}
21+
22+
// CIR: %[[COND:.*]] = cir.alloca !cir.bool, !cir.ptr<!cir.bool>, ["cond", init]
23+
// CIR: %[[COMPLEX_A:.*]] = cir.alloca !cir.complex<!s32i>, !cir.ptr<!cir.complex<!s32i>>, ["a", init]
24+
// CIR: %[[COMPLEX_B:.*]] = cir.alloca !cir.complex<!s32i>, !cir.ptr<!cir.complex<!s32i>>, ["b", init]
25+
// CIR: %[[RESULT:.*]] = cir.alloca !cir.complex<!s32i>, !cir.ptr<!cir.complex<!s32i>>, ["c", init]
26+
// CIR: %[[TMP_COND:.*]] = cir.load{{.*}} %[[COND]] : !cir.ptr<!cir.bool>, !cir.bool
27+
// CIR: %[[RESULT_VAL:.*]] = cir.ternary(%[[TMP_COND]], true {
28+
// CIR: %[[TMP_A:.*]] = cir.load{{.*}} %[[COMPLEX_A]] : !cir.ptr<!cir.complex<!s32i>>, !cir.complex<!s32i>
29+
// CIR: cir.yield %[[TMP_A]] : !cir.complex<!s32i>
30+
// CIR: }, false {
31+
// CIR: %[[TMP_B:.*]] = cir.load{{.*}} %[[COMPLEX_B]] : !cir.ptr<!cir.complex<!s32i>>, !cir.complex<!s32i>
32+
// CIR: cir.yield %[[TMP_B]] : !cir.complex<!s32i>
33+
// CIR: }) : (!cir.bool) -> !cir.complex<!s32i>
34+
// CIR: cir.store{{.*}} %[[RESULT_VAL]], %[[RESULT]] : !cir.complex<!s32i>, !cir.ptr<!cir.complex<!s32i>>
35+
36+
// LLVM: %[[COND:.*]] = alloca i8, i64 1, align 1
37+
// LLVM: %[[COMPLEX_A:.*]] = alloca { i32, i32 }, i64 1, align 4
38+
// LLVM: %[[COMPLEX_B:.*]] = alloca { i32, i32 }, i64 1, align 4
39+
// LLVM: %[[RESULT:.*]] = alloca { i32, i32 }, i64 1, align 4
40+
// LLVM: %[[TMP_COND:.*]] = load i8, ptr %[[COND]], align 1
41+
// LLVM: %[[COND_VAL:.*]] = trunc i8 %[[TMP_COND]] to i1
42+
// LLVM: br i1 %[[COND_VAL]], label %[[TRUE_BB:.*]], label %[[FALSE_BB:.*]]
43+
// LLVM: [[TRUE_BB]]:
44+
// LLVM: %[[TMP_A:.*]] = load { i32, i32 }, ptr %[[COMPLEX_A]], align 4
45+
// LLVM: br label %[[END_BB:.*]]
46+
// LLVM: [[FALSE_BB]]:
47+
// LLVM: %[[TMP_B:.*]] = load { i32, i32 }, ptr %[[COMPLEX_B]], align 4
48+
// LLVM: br label %[[END_BB]]
49+
// LLVM: [[END_BB]]:
50+
// LLVM: %[[RESULT_VAL:.*]] = phi { i32, i32 } [ %[[TMP_B]], %[[FALSE_BB]] ], [ %[[TMP_A]], %[[TRUE_BB]] ]
51+
// LLVM: store { i32, i32 } %[[RESULT_VAL]], ptr %[[RESULT]], align 4

0 commit comments

Comments
 (0)