https://github.com/AmrDeveloper updated https://github.com/llvm/llvm-project/pull/172088
>From 66572f01651b5c4fbaa01710918f36bddd9668a0 Mon Sep 17 00:00:00 2001 From: Amr Hesham <[email protected]> Date: Fri, 12 Dec 2025 22:34:24 +0100 Subject: [PATCH 1/2] [CIR] Add support for EmbedExpr for ScalarExpr --- clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp | 10 +++- clang/test/CIR/CodeGen/embed-expr.c | 68 ++++++++++++++++++++++ 2 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 clang/test/CIR/CodeGen/embed-expr.c diff --git a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp index e86c62bf7793f..4577b646ea00c 100644 --- a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp @@ -263,8 +263,14 @@ class ScalarExprEmitter : public StmtVisitor<ScalarExprEmitter, mlir::Value> { return {}; } mlir::Value VisitEmbedExpr(EmbedExpr *e) { - cgf.cgm.errorNYI(e->getSourceRange(), "ScalarExprEmitter: embed"); - return {}; + assert(e->getDataElementCount() == 1); + auto it = e->begin(); + QualType qualTy = e->getType(); + mlir::Type ty = cgf.convertType(qualTy); + llvm::APInt value = (*it)->getValue(); + uint64_t actualValue = qualTy->isSignedIntegerType() ? value.getSExtValue() + : value.getZExtValue(); + return builder.getConstInt(cgf.getLoc(e->getExprLoc()), ty, actualValue); } mlir::Value VisitOpaqueValueExpr(OpaqueValueExpr *e) { if (e->isGLValue()) diff --git a/clang/test/CIR/CodeGen/embed-expr.c b/clang/test/CIR/CodeGen/embed-expr.c new file mode 100644 index 0000000000000..24009e3732736 --- /dev/null +++ b/clang/test/CIR/CodeGen/embed-expr.c @@ -0,0 +1,68 @@ +// RUN: %clang_cc1 -std=c23 -triple x86_64-unknown-linux-gnu -Wno-unused-value -fclangir -emit-cir %s -o %t.cir +// RUN: FileCheck --input-file=%t.cir %s -check-prefix=CIR +// RUN: %clang_cc1 -std=c23 -triple x86_64-unknown-linux-gnu -Wno-unused-value -fclangir -emit-llvm %s -o %t-cir.ll +// RUN: FileCheck --input-file=%t-cir.ll %s -check-prefix=LLVM +// RUN: %clang_cc1 -std=c23 -triple x86_64-unknown-linux-gnu -Wno-unused-value -emit-llvm %s -o %t.ll +// RUN: FileCheck --input-file=%t.ll %s -check-prefix=OGCG + +void embed_expr_on_scalar_with_constants() { + int a[3] = { + 1, + 2, +#embed __FILE__ + }; +} + +// CIR: %[[A_ADDR:.*]] = cir.alloca !cir.array<!s32i x 3>, !cir.ptr<!cir.array<!s32i x 3>>, ["a", init] +// CIR: %[[ARRAY:.*]] = cir.const #cir.const_array<[#cir.int<1> : !s32i, #cir.int<2> : !s32i, #cir.int<47> : !s32i]> : !cir.array<!s32i x 3> +// CIR: cir.store {{.*}} %[[ARRAY]], %[[A_ADDR]] : !cir.array<!s32i x 3>, !cir.ptr<!cir.array<!s32i x 3>> + +// LLVM: %[[A_ADDR:.*]] = alloca [3 x i32], i64 1, align 4 +// LLVM: store [3 x i32] [i32 1, i32 2, i32 47], ptr %[[A_ADDR]], align 4 + +// OGCG: %[[A_ADDR:.*]] = alloca [3 x i32], align 4 +// OGCG: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %[[A_ADDR]], ptr align 4 @__const.embed_expr_on_scalar_with_constants.a, i64 12, i1 false) + +void embed_expr_on_scalar_with_non_constants() { + int a; + int b[3] = { + a, + a, +#embed __FILE__ + }; +} + +// CIR: %[[A_ADDR:.*]] = cir.alloca !s32i, !cir.ptr<!s32i>, ["a"] +// CIR: %[[B_ADDR:.*]] = cir.alloca !cir.array<!s32i x 3>, !cir.ptr<!cir.array<!s32i x 3>>, ["b", init] +// CIR: %[[B_PTR:.*]] = cir.cast array_to_ptrdecay %[[B_ADDR]] : !cir.ptr<!cir.array<!s32i x 3>> -> !cir.ptr<!s32i> +// CIR: %[[TMP_A:.*]] = cir.load {{.*}} %[[A_ADDR]] : !cir.ptr<!s32i>, !s32i +// CIR: cir.store {{.*}} %[[TMP_A]], %[[B_PTR]] : !s32i, !cir.ptr<!s32i> +// CIR: %[[CONST_1:.*]] = cir.const #cir.int<1> : !s64i +// CIR: %[[B_ELEM_1_PTR:.*]] = cir.ptr_stride %[[B_PTR]], %[[CONST_1]] : (!cir.ptr<!s32i>, !s64i) -> !cir.ptr<!s32i> +// CIR: %[[TMP_A:.*]] = cir.load {{.*}} %[[A_ADDR]] : !cir.ptr<!s32i>, !s32i +// CIR: cir.store {{.*}} %[[TMP_A]], %[[B_ELEM_1_PTR]] : !s32i, !cir.ptr<!s32i> +// CIR: %[[CONST_2:.*]] = cir.const #cir.int<2> : !s64i +// CIR: %[[B_ELEM_2_PTR:.*]] = cir.ptr_stride %[[B_PTR]], %[[CONST_2]] : (!cir.ptr<!s32i>, !s64i) -> !cir.ptr<!s32i> +// CIR: %[[CONST_47:.*]] = cir.const #cir.int<47> : !s32i +// CIR: cir.store {{.*}} %[[CONST_47]], %[[B_ELEM_2_PTR]] : !s32i, !cir.ptr<!s32i> + +// LLVM: %[[A_ADDR:.*]] = alloca i32, i64 1, align 4 +// LLVM: %[[B_ADDR:.*]] = alloca [3 x i32], i64 1, align 4 +// LLVM: %[[B_ELEM_0_PTR:.*]] = getelementptr i32, ptr %[[B_ADDR]], i32 0 +// LLVM: %[[TMP_A:.*]] = load i32, ptr %[[A_ADDR]], align 4 +// LLVM: store i32 %[[TMP_A]], ptr %[[B_ELEM_0_PTR]], align 4 +// LLVM: %[[B_ELEM_1_PTR:.*]] = getelementptr i32, ptr %[[B_ELEM_0_PTR]], i64 1 +// LLVM: %[[TMP_A:.*]] = load i32, ptr %[[A_ADDR]], align 4 +// LLVM: store i32 %[[TMP_A]], ptr %[[B_ELEM_1_PTR]], align 4 +// LLVM: %[[B_ELEM_2_PTR:.*]] = getelementptr i32, ptr %[[B_ELEM_0_PTR]], i64 2 +// LLVM: store i32 47, ptr %[[B_ELEM_2_PTR]], align 4 + +// OGCG: %[[A_ADDR:.*]] = alloca i32, align 4 +// OGCG: %[[B_ADDR:.*]] = alloca [3 x i32], align 4 +// OGCG: %[[TMP_A:.*]] = load i32, ptr %[[A_ADDR]], align 4 +// OGCG: store i32 %[[TMP_A]], ptr %[[B_ADDR]], align 4 +// OGCG: %[[B_ELEM_1_PTR:.*]] = getelementptr inbounds i32, ptr %[[B_ADDR]], i64 1 +// OGCG: %[[TMP_A:.*]] = load i32, ptr %[[A_ADDR]], align 4 +// OGCG: store i32 %[[TMP_A]], ptr %[[B_ELEM_1_PTR]], align 4 +// OGCG: %[[B_ELEM_2_PTR:.*]] = getelementptr inbounds i32, ptr %[[B_ADDR]], i64 2 +// OGCG: store i32 47, ptr %[[B_ELEM_2_PTR]], align 4 >From 4284ebe0d67d0dff9062d505951014fa933e5009 Mon Sep 17 00:00:00 2001 From: Amr Hesham <[email protected]> Date: Sat, 13 Dec 2025 12:59:09 +0100 Subject: [PATCH 2/2] Address code review comments --- clang/lib/CIR/CodeGen/CIRGenBuilder.cpp | 5 +++-- clang/lib/CIR/CodeGen/CIRGenBuilder.h | 3 ++- clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp | 7 ++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/clang/lib/CIR/CodeGen/CIRGenBuilder.cpp b/clang/lib/CIR/CodeGen/CIRGenBuilder.cpp index 75355ee33b29d..42df10b2fbf4b 100644 --- a/clang/lib/CIR/CodeGen/CIRGenBuilder.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenBuilder.cpp @@ -53,8 +53,9 @@ cir::ConstantOp CIRGenBuilderTy::getConstInt(mlir::Location loc, } cir::ConstantOp CIRGenBuilderTy::getConstInt(mlir::Location loc, - llvm::APInt intVal) { - return getConstInt(loc, llvm::APSInt(intVal)); + llvm::APInt intVal, + bool isUnsigned) { + return getConstInt(loc, llvm::APSInt(intVal, isUnsigned)); } cir::ConstantOp CIRGenBuilderTy::getConstInt(mlir::Location loc, mlir::Type t, diff --git a/clang/lib/CIR/CodeGen/CIRGenBuilder.h b/clang/lib/CIR/CodeGen/CIRGenBuilder.h index 5b10bddd054ea..55f4b42689c8e 100644 --- a/clang/lib/CIR/CodeGen/CIRGenBuilder.h +++ b/clang/lib/CIR/CodeGen/CIRGenBuilder.h @@ -287,7 +287,8 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy { cir::ConstantOp getConstInt(mlir::Location loc, llvm::APSInt intVal); - cir::ConstantOp getConstInt(mlir::Location loc, llvm::APInt intVal); + cir::ConstantOp getConstInt(mlir::Location loc, llvm::APInt intVal, + bool isUnsigned = true); cir::ConstantOp getConstInt(mlir::Location loc, mlir::Type t, uint64_t c); diff --git a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp index 4577b646ea00c..3faafa7f4cdd6 100644 --- a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp @@ -265,12 +265,9 @@ class ScalarExprEmitter : public StmtVisitor<ScalarExprEmitter, mlir::Value> { mlir::Value VisitEmbedExpr(EmbedExpr *e) { assert(e->getDataElementCount() == 1); auto it = e->begin(); - QualType qualTy = e->getType(); - mlir::Type ty = cgf.convertType(qualTy); llvm::APInt value = (*it)->getValue(); - uint64_t actualValue = qualTy->isSignedIntegerType() ? value.getSExtValue() - : value.getZExtValue(); - return builder.getConstInt(cgf.getLoc(e->getExprLoc()), ty, actualValue); + return builder.getConstInt(cgf.getLoc(e->getExprLoc()), value, + e->getType()->isUnsignedIntegerType()); } mlir::Value VisitOpaqueValueExpr(OpaqueValueExpr *e) { if (e->isGLValue()) _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
