Skip to content
This repository was archived by the owner on Feb 21, 2026. It is now read-only.

Commit 5237bd4

Browse files
authored
[CIR] Backport ConstantExpr support for ScalarExpr (#2082)
Backport ConstantExpr support for ScalarExpr from the upstream with tests also from Complex ConstantExpr
1 parent addef71 commit 5237bd4

2 files changed

Lines changed: 61 additions & 1 deletion

File tree

clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,25 @@ class ScalarExprEmitter : public StmtVisitor<ScalarExprEmitter, mlir::Value> {
155155
return {};
156156
}
157157

158-
mlir::Value VisitConstantExpr(ConstantExpr *E) { llvm_unreachable("NYI"); }
158+
mlir::Value VisitConstantExpr(ConstantExpr *E) {
159+
// A constant expression of type 'void'
160+
// generates no code and produces no value.
161+
if (E->getType()->isVoidType())
162+
return {};
163+
164+
if (mlir::Attribute result = ConstantEmitter(CGF).tryEmitConstantExpr(E)) {
165+
if (E->isGLValue()) {
166+
return {};
167+
}
168+
169+
return Builder.getConstant(CGF.getLoc(E->getSourceRange()),
170+
mlir::cast<mlir::TypedAttr>(result));
171+
}
172+
173+
llvm_unreachable("ScalarExprEmitter: VisitConstantExpr");
174+
return {};
175+
}
176+
159177
mlir::Value VisitParenExpr(ParenExpr *PE) { return Visit(PE->getSubExpr()); }
160178

161179
mlir::Value VisitPackIndexingExpr(PackIndexingExpr *E) {
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// RUN: %clang_cc1 -std=c++20 -triple x86_64-unknown-linux-gnu -Wno-unused-value -fclangir -emit-cir %s -o %t.cir
2+
// RUN: FileCheck --input-file=%t.cir %s -check-prefix=CIR
3+
// RUN: %clang_cc1 -std=c++20 -triple x86_64-unknown-linux-gnu -Wno-unused-value -fclangir -emit-llvm %s -o %t-cir.ll
4+
// RUN: FileCheck --input-file=%t-cir.ll %s -check-prefix=LLVM
5+
// RUN: %clang_cc1 -std=c++20 -triple x86_64-unknown-linux-gnu -Wno-unused-value -emit-llvm %s -o %t.ll
6+
// RUN: FileCheck --input-file=%t.ll %s -check-prefix=OGCG
7+
8+
struct StructWithConstEval {
9+
consteval int _Complex consteval_ret_complex() { return {1, 2}; }
10+
consteval int consteval_ret_int() { return 1; }
11+
consteval void consteval_ret_void() {}
12+
};
13+
14+
void calling_consteval_methods() {
15+
StructWithConstEval a;
16+
int b = a.consteval_ret_int();
17+
int _Complex c = a.consteval_ret_complex();
18+
a.consteval_ret_void();
19+
}
20+
21+
// CIR: %[[A_ADDR:.*]] = cir.alloca !rec_StructWithConstEval, !cir.ptr<!rec_StructWithConstEval>, ["a"]
22+
// CIR: %[[B_ADDR:.*]] = cir.alloca !s32i, !cir.ptr<!s32i>, ["b", init]
23+
// CIR: %[[C_ADDR:.*]] = cir.alloca !cir.complex<!s32i>, !cir.ptr<!cir.complex<!s32i>>, ["c", init]
24+
// CIR: %[[CONST_1:.*]] = cir.const #cir.int<1> : !s32i
25+
// CIR: cir.store {{.*}} %[[CONST_1]], %[[B_ADDR]] : !s32i, !cir.ptr<!s32i>
26+
// CIR: %[[CONST_COMPLEX:.*]] = cir.const #cir.complex<#cir.int<1> : !s32i, #cir.int<2> : !s32i> : !cir.complex<!s32i>
27+
// CIR: cir.store {{.*}} %[[CONST_COMPLEX]], %[[C_ADDR]] : !cir.complex<!s32i>, !cir.ptr<!cir.complex<!s32i>>
28+
29+
// LLVM: %[[A_ADDR:.*]] = alloca %struct.StructWithConstEval, i64 1, align 1
30+
// LLVM: %[[B_ADDR:.*]] = alloca i32, i64 1, align 4
31+
// LLVM: %[[C_ADDR:.*]] = alloca { i32, i32 }, i64 1, align 4
32+
// LLVM: store i32 1, ptr %[[B_ADDR]], align 4
33+
// LLVM: store { i32, i32 } { i32 1, i32 2 }, ptr %[[C_ADDR]], align 4
34+
35+
// OGCG: %[[A_ADDR:.*]] = alloca %struct.StructWithConstEval, align 1
36+
// OGCG: %[[B_ADDR:.*]] = alloca i32, align 4
37+
// OGCG: %[[C_ADDR:.*]] = alloca { i32, i32 }, align 4
38+
// OGCG: store i32 1, ptr %[[B_ADDR]], align 4
39+
// OGCG: %[[C_REAL_PTR:.*]] = getelementptr inbounds nuw { i32, i32 }, ptr %[[C_ADDR]], i32 0, i32 0
40+
// OGCG: %[[C_IMAG_PTR:.*]] = getelementptr inbounds nuw { i32, i32 }, ptr %[[C_ADDR]], i32 0, i32 1
41+
// OGCG: store i32 1, ptr %[[C_REAL_PTR]], align 4
42+
// OGCG: store i32 2, ptr %[[C_IMAG_PTR]], align 4

0 commit comments

Comments
 (0)