https://github.com/andykaylor updated https://github.com/llvm/llvm-project/pull/171897
>From 9ee83ee60062a6a9c75dffb25816268939b3e31a Mon Sep 17 00:00:00 2001 From: Andy Kaylor <[email protected]> Date: Tue, 9 Dec 2025 14:45:09 -0800 Subject: [PATCH 1/2] [CIR] Add support for data member comparison This adds support for handling data member pointer comparisons in CIR. --- .../Transforms/TargetLowering/CIRCXXABI.h | 4 ++ .../TargetLowering/LowerItaniumCXXABI.cpp | 12 ++++ .../CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp | 11 +++- .../CodeGen/pointer-to-data-member-cmp.cpp | 58 +++++++++++++++++++ 4 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 clang/test/CIR/CodeGen/pointer-to-data-member-cmp.cpp diff --git a/clang/lib/CIR/Dialect/Transforms/TargetLowering/CIRCXXABI.h b/clang/lib/CIR/Dialect/Transforms/TargetLowering/CIRCXXABI.h index 90f0ac3478f9d..a2439f1c24f10 100644 --- a/clang/lib/CIR/Dialect/Transforms/TargetLowering/CIRCXXABI.h +++ b/clang/lib/CIR/Dialect/Transforms/TargetLowering/CIRCXXABI.h @@ -53,6 +53,10 @@ class CIRCXXABI { lowerGetRuntimeMember(cir::GetRuntimeMemberOp op, mlir::Type loweredResultTy, mlir::Value loweredAddr, mlir::Value loweredMember, mlir::OpBuilder &builder) const = 0; + + virtual mlir::Value lowerDataMemberCmp(cir::CmpOp op, mlir::Value loweredLhs, + mlir::Value loweredRhs, + mlir::OpBuilder &builder) const = 0; }; /// Creates an Itanium-family ABI. diff --git a/clang/lib/CIR/Dialect/Transforms/TargetLowering/LowerItaniumCXXABI.cpp b/clang/lib/CIR/Dialect/Transforms/TargetLowering/LowerItaniumCXXABI.cpp index ce4b0c7e92d09..abffb193798cc 100644 --- a/clang/lib/CIR/Dialect/Transforms/TargetLowering/LowerItaniumCXXABI.cpp +++ b/clang/lib/CIR/Dialect/Transforms/TargetLowering/LowerItaniumCXXABI.cpp @@ -47,6 +47,10 @@ class LowerItaniumCXXABI : public CIRCXXABI { lowerGetRuntimeMember(cir::GetRuntimeMemberOp op, mlir::Type loweredResultTy, mlir::Value loweredAddr, mlir::Value loweredMember, mlir::OpBuilder &builder) const override; + + mlir::Value lowerDataMemberCmp(cir::CmpOp op, mlir::Value loweredLhs, + mlir::Value loweredRhs, + mlir::OpBuilder &builder) const override; }; } // namespace @@ -108,4 +112,12 @@ mlir::Operation *LowerItaniumCXXABI::lowerGetRuntimeMember( cir::CastKind::bitcast, memberBytesPtr); } +mlir::Value +LowerItaniumCXXABI::lowerDataMemberCmp(cir::CmpOp op, mlir::Value loweredLhs, + mlir::Value loweredRhs, + mlir::OpBuilder &builder) const { + return cir::CmpOp::create(builder, op.getLoc(), op.getKind(), loweredLhs, + loweredRhs); +} + } // namespace cir diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp index 00307df62ce5a..026a165782c44 100644 --- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp +++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp @@ -2559,8 +2559,17 @@ mlir::LogicalResult CIRToLLVMCmpOpLowering::matchAndRewrite( mlir::ConversionPatternRewriter &rewriter) const { mlir::Type type = cmpOp.getLhs().getType(); - assert(!cir::MissingFeatures::dataMemberType()); assert(!cir::MissingFeatures::methodType()); + if (mlir::isa<cir::DataMemberType>(type)) { + assert(lowerMod && "lowering module is not available"); + + mlir::Value loweredResult; + loweredResult = lowerMod->getCXXABI().lowerDataMemberCmp( + cmpOp, adaptor.getLhs(), adaptor.getRhs(), rewriter); + + rewriter.replaceOp(cmpOp, loweredResult); + return mlir::success(); + } if (mlir::isa<cir::IntType, mlir::IntegerType>(type)) { bool isSigned = mlir::isa<cir::IntType>(type) diff --git a/clang/test/CIR/CodeGen/pointer-to-data-member-cmp.cpp b/clang/test/CIR/CodeGen/pointer-to-data-member-cmp.cpp new file mode 100644 index 0000000000000..fa3491252cb5f --- /dev/null +++ b/clang/test/CIR/CodeGen/pointer-to-data-member-cmp.cpp @@ -0,0 +1,58 @@ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++17 -fclangir -emit-cir %s -o %t.cir +// RUN: FileCheck --input-file=%t.cir --check-prefix=CIR %s +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++17 -fclangir -emit-llvm %s -o %t-cir.ll +// RUN: FileCheck --input-file=%t-cir.ll --check-prefix=LLVM %s +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++17 -emit-llvm %s -o %t.ll +// RUN: FileCheck --input-file=%t.ll --check-prefix=OGCG %s + +struct Foo { + int a; +}; + +struct Bar { + int a; +}; + +bool eq(int Foo::*x, int Foo::*y) { + return x == y; +} + +// CIR-LABEL: @_Z2eqM3FooiS0_ +// CIR: %[[#x:]] = cir.load{{.*}} %{{.+}} : !cir.ptr<!cir.data_member<!s32i in !rec_Foo>>, !cir.data_member<!s32i in !rec_Foo> +// CIR-NEXT: %[[#y:]] = cir.load{{.*}} %{{.+}} : !cir.ptr<!cir.data_member<!s32i in !rec_Foo>>, !cir.data_member<!s32i in !rec_Foo> +// CIR-NEXT: %{{.+}} = cir.cmp(eq, %[[#x]], %[[#y]]) : !cir.data_member<!s32i in !rec_Foo>, !cir.bool +// CIR: } + +// LLVM-LABEL: @_Z2eqM3FooiS0_ +// LLVM: %[[#x:]] = load i64, ptr %{{.+}}, align 8 +// LLVM-NEXT: %[[#y:]] = load i64, ptr %{{.+}}, align 8 +// LLVM-NEXT: %{{.+}} = icmp eq i64 %[[#x]], %[[#y]] +// LLVM: } + +// OGCG-LABEL: @_Z2eqM3FooiS0_ +// OGCG: %[[#x:]] = load i64, ptr %{{.+}}, align 8 +// OGCG-NEXT: %[[#y:]] = load i64, ptr %{{.+}}, align 8 +// OGCG-NEXT: %{{.+}} = icmp eq i64 %[[#x]], %[[#y]] +// OGCG: } + +bool ne(int Foo::*x, int Foo::*y) { + return x != y; +} + +// CIR-LABEL: @_Z2neM3FooiS0_ +// CIR: %[[#x:]] = cir.load{{.*}} %{{.+}} : !cir.ptr<!cir.data_member<!s32i in !rec_Foo>>, !cir.data_member<!s32i in !rec_Foo> +// CIR-NEXT: %[[#y:]] = cir.load{{.*}} %{{.+}} : !cir.ptr<!cir.data_member<!s32i in !rec_Foo>>, !cir.data_member<!s32i in !rec_Foo> +// CIR-NEXT: %{{.+}} = cir.cmp(ne, %[[#x]], %[[#y]]) : !cir.data_member<!s32i in !rec_Foo>, !cir.bool +// CIR: } + +// LLVM-LABEL: @_Z2neM3FooiS0_ +// LLVM: %[[#x:]] = load i64, ptr %{{.+}}, align 8 +// LLVM-NEXT: %[[#y:]] = load i64, ptr %{{.+}}, align 8 +// LLVM-NEXT: %{{.+}} = icmp ne i64 %[[#x]], %[[#y]] +// LLVM: } + +// OGCG-LABEL: @_Z2neM3FooiS0_ +// OGCG: %[[#x:]] = load i64, ptr %{{.+}}, align 8 +// OGCG-NEXT: %[[#y:]] = load i64, ptr %{{.+}}, align 8 +// OGCG-NEXT: %{{.+}} = icmp ne i64 %[[#x]], %[[#y]] +// OGCG: } >From 783935f0ce0491c202b1bd62e9374c6053d3b8c4 Mon Sep 17 00:00:00 2001 From: Andy Kaylor <[email protected]> Date: Thu, 11 Dec 2025 17:07:04 -0800 Subject: [PATCH 2/2] Lower directly to LLVM compare --- .../CIR/Dialect/Transforms/TargetLowering/CMakeLists.txt | 1 + .../Transforms/TargetLowering/LowerItaniumCXXABI.cpp | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/clang/lib/CIR/Dialect/Transforms/TargetLowering/CMakeLists.txt b/clang/lib/CIR/Dialect/Transforms/TargetLowering/CMakeLists.txt index 158c42e729536..3a1ab34cea4d9 100644 --- a/clang/lib/CIR/Dialect/Transforms/TargetLowering/CMakeLists.txt +++ b/clang/lib/CIR/Dialect/Transforms/TargetLowering/CMakeLists.txt @@ -17,4 +17,5 @@ add_clang_library(MLIRCIRTargetLowering MLIRDLTIDialect MLIRCIR MLIRCIRInterfaces + MLIRLLVMDialect ) diff --git a/clang/lib/CIR/Dialect/Transforms/TargetLowering/LowerItaniumCXXABI.cpp b/clang/lib/CIR/Dialect/Transforms/TargetLowering/LowerItaniumCXXABI.cpp index abffb193798cc..7897ab24a57b3 100644 --- a/clang/lib/CIR/Dialect/Transforms/TargetLowering/LowerItaniumCXXABI.cpp +++ b/clang/lib/CIR/Dialect/Transforms/TargetLowering/LowerItaniumCXXABI.cpp @@ -116,8 +116,13 @@ mlir::Value LowerItaniumCXXABI::lowerDataMemberCmp(cir::CmpOp op, mlir::Value loweredLhs, mlir::Value loweredRhs, mlir::OpBuilder &builder) const { - return cir::CmpOp::create(builder, op.getLoc(), op.getKind(), loweredLhs, - loweredRhs); + assert(op.getKind() == cir::CmpOpKind::eq || + op.getKind() == cir::CmpOpKind::ne); + mlir::LLVM::ICmpPredicate kind = op.getKind() == cir::CmpOpKind::eq + ? mlir::LLVM::ICmpPredicate::eq + : mlir::LLVM::ICmpPredicate::ne; + return mlir::LLVM::ICmpOp::create(builder, op.getLoc(), kind, loweredLhs, + loweredRhs); } } // namespace cir _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
