Skip to content

[CIR] Backport ChooseExpr for AggregateExpr #1950

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.

Sign up for GitHub

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
Oct 16, 2025
Merged

[CIR] Backport ChooseExpr for AggregateExpr #1950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions clang/lib/CIR/CodeGen/CIRGenExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2706,6 +2706,8 @@ LValue CIRGenFunction::emitLValue(const Expr *E) {
llvm_unreachable("cannot emit a property reference directly");
case Expr::StmtExprClass:
return emitStmtExprLValue(cast<StmtExpr>(E));
case Expr::ChooseExprClass:
return emitLValue(cast<ChooseExpr>(E)->getChosenSubExpr());
}

llvm_unreachable("NYI");
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/CIR/CodeGen/CIRGenExprAgg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ class AggExprEmitter : public StmtVisitor<AggExprEmitter> {
}

void VisitAbstractConditionalOperator(const AbstractConditionalOperator *E);
void VisitChooseExpr(const ChooseExpr *E) { llvm_unreachable("NYI"); }
void VisitChooseExpr(const ChooseExpr *E) { Visit(E->getChosenSubExpr()); }
void VisitInitListExpr(InitListExpr *E);
void VisitCXXParenListInitExpr(CXXParenListInitExpr *E);
void VisitCXXParenListOrInitListExpr(Expr *ExprToVisit, ArrayRef<Expr *> Args,
Expand Down
12 changes: 12 additions & 0 deletions clang/test/CIR/CodeGen/struct.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,3 +195,15 @@ void designated_init_update_expr() {
// CHECK: %[[CONST_1:.*]] = cir.const #cir.int<1> : !s32i
// CHECK: cir.store{{.*}} %[[CONST_1]], %[[ELEM_0_PTR]] : !s32i, !cir.ptr<!s32i>
// CHECK: %[[ELEM_1_PTR:.*]] = cir.get_member %[[C_ADDR]][1] {name = "b"} : !cir.ptr<!rec_CompleteS> -> !cir.ptr<!s8i>

void choose_expr() {
CompleteS a;
CompleteS b;
CompleteS c = __builtin_choose_expr(true, a, b);
}

// CHECK: cir.func{{.*}} @_Z11choose_exprv()
// CHECK: %[[A_ADDR:.*]] = cir.alloca !rec_CompleteS, !cir.ptr<!rec_CompleteS>, ["a"]
// CHECK: %[[B_ADDR:.*]] = cir.alloca !rec_CompleteS, !cir.ptr<!rec_CompleteS>, ["b"]
// CHECK: %[[C_ADDR:.*]] = cir.alloca !rec_CompleteS, !cir.ptr<!rec_CompleteS>, ["c", init]
// CHECK: cir.copy %[[A_ADDR]] to %[[C_ADDR]] : !cir.ptr<!rec_CompleteS>
Loading