Author: Amr Hesham Date: 2025-12-13T13:01:19+01:00 New Revision: 95e4dc62b14b61d21e0b42714d2ef476409f9e57
URL: https://github.com/llvm/llvm-project/commit/95e4dc62b14b61d21e0b42714d2ef476409f9e57 DIFF: https://github.com/llvm/llvm-project/commit/95e4dc62b14b61d21e0b42714d2ef476409f9e57.diff LOG: [CIR] Add support for the RequiresExpr (#171818) Add support for the RequiresExpr Added: clang/test/CIR/CodeGen/requires-expr.cpp Modified: clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp Removed: ################################################################################ diff --git a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp index e86c62bf7793f..9b9cacc9eaa53 100644 --- a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp @@ -852,8 +852,7 @@ class ScalarExprEmitter : public StmtVisitor<ScalarExprEmitter, mlir::Value> { return builder.getBool(e->isSatisfied(), cgf.getLoc(e->getExprLoc())); } mlir::Value VisitRequiresExpr(const RequiresExpr *e) { - cgf.cgm.errorNYI(e->getSourceRange(), "ScalarExprEmitter: requires"); - return {}; + return builder.getBool(e->isSatisfied(), cgf.getLoc(e->getExprLoc())); } mlir::Value VisitArrayTypeTraitExpr(const ArrayTypeTraitExpr *e) { cgf.cgm.errorNYI(e->getSourceRange(), diff --git a/clang/test/CIR/CodeGen/requires-expr.cpp b/clang/test/CIR/CodeGen/requires-expr.cpp new file mode 100644 index 0000000000000..6ca6da9802508 --- /dev/null +++ b/clang/test/CIR/CodeGen/requires-expr.cpp @@ -0,0 +1,51 @@ +// RUN: %clang_cc1 -std=c++20 -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=c++20 -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=c++20 -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 + +template <typename T> void summable(T a) { + if (requires { a + a; }) { + T b = a + a; + } +} + +// CIR: %[[A_ADDR:.*]] = cir.alloca !s32i, !cir.ptr<!s32i>, ["a", init] +// CIR: cir.store %[[ARG_A:.*]], %[[A_ADDR]] : !s32i, !cir.ptr<!s32i> +// CIR: cir.scope { +// CIR: %[[CONST_TRUE:.*]] = cir.const #true +// CIR: cir.if %[[CONST_TRUE]] { +// CIR: %[[B_ADDR:.*]] = cir.alloca !s32i, !cir.ptr<!s32i>, ["b", init] +// CIR: %[[TMP_A_1:.*]] = cir.load {{.*}} %[[A_ADDR]] : !cir.ptr<!s32i>, !s32i +// CIR: %[[TMP_A_2:.*]] = cir.load {{.*}} %[[A_ADDR]] : !cir.ptr<!s32i>, !s32i +// CIR: %[[RESULT:.*]] = cir.binop(add, %[[TMP_A_1]], %[[TMP_A_2]]) nsw : !s32i +// CIR: cir.store {{.*}} %[[RESULT]], %[[B_ADDR]] : !s32i, !cir.ptr<!s32i> +// CIR: } +// CIR: } + +// LLVM: %[[B_ADDR:.*]] = alloca i32, i64 1, align 4 +// LLVM: %[[A_ADDR:.*]] = alloca i32, i64 1, align 4 +// LLVM: store i32 %[[ARG_A:.*]], ptr %[[A_ADDR]], align 4 +// LLVM: br label %[[IF_COND:.*]] +// LLVM: [[IF_COND]]: +// LLVM: br i1 true, label %[[IF_THEN:.*]], label %[[IF_END:.*]] +// LLVM: [[IF_THEN]]: +// LLVM: %[[TMP_A_1:.*]] = load i32, ptr %[[A_ADDR]], align 4 +// LLVM: %[[TMP_A_2:.*]] = load i32, ptr %[[A_ADDR]], align 4 +// LLVM: %[[RESULT:.*]] = add nsw i32 %[[TMP_A_1]], %[[TMP_A_2]] +// LLVM: store i32 %[[RESULT]], ptr %[[B_ADDR]], align 4 +// LLVM: br label %[[IF_END]] +// LLVM: [[IF_END]]: +// LLVM: br label %[[RET:.*]] + +// OGCG: %[[A_ADDR:.*]] = alloca i32, align 4 +// OGCG: %[[B_ADDR:.*]] = alloca i32, align 4 +// OGCG: store i32 %[[ARG_A:.*]], ptr %[[A_ADDR]], align 4 +// OGCG: %[[TMP_A_1:.*]] = load i32, ptr %[[A_ADDR]], align 4 +// OGCG: %[[TMP_A_2:.*]] = load i32, ptr %[[A_ADDR]], align 4 +// OGCG: %[[RESULT:.*]] = add nsw i32 %[[TMP_A_1]], %[[TMP_A_2]] +// OGCG: store i32 %[[RESULT]], ptr %[[B_ADDR]], align 4 + +void call_function_with_requires_expr() { summable(1); } + _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
