https://github.com/erichkeane created https://github.com/llvm/llvm-project/pull/186874
This is currently an NFC change, as the CXXABITypeConverter has no members yet. This patch splits it off into its own type, as it is going to need to have members when we start transforming record types, but doesn't implement that part yet (coming in future patches). >From b35d818c23f3f3135ac3a9f8399c00262a1c415d Mon Sep 17 00:00:00 2001 From: erichkeane <[email protected]> Date: Mon, 16 Mar 2026 12:51:17 -0700 Subject: [PATCH] [CIR][NFC] Split the CXXABI 'TypeConverter' into its own type. This is currently an NFC change, as the CXXABITypeConverter has no members yet. This patch splits it off into its own type, as it is going to need to have members when we start transforming record types, but doesn't implement that part yet (coming in future patches). --- .../CIR/Dialect/Transforms/CXXABILowering.cpp | 102 +++++++++--------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/clang/lib/CIR/Dialect/Transforms/CXXABILowering.cpp b/clang/lib/CIR/Dialect/Transforms/CXXABILowering.cpp index d2c7ac37e8a96..2de1735cee856 100644 --- a/clang/lib/CIR/Dialect/Transforms/CXXABILowering.cpp +++ b/clang/lib/CIR/Dialect/Transforms/CXXABILowering.cpp @@ -450,56 +450,55 @@ mlir::LogicalResult CIRVTableGetTypeInfoOpABILowering::matchAndRewrite( return mlir::success(); } -// Prepare the type converter for the CXXABI lowering pass. -// Even though this is a CIR-to-CIR pass, we are eliminating some CIR types. -static void prepareCXXABITypeConverter(mlir::TypeConverter &converter, - mlir::DataLayout &dataLayout, - cir::LowerModule &lowerModule) { - converter.addConversion([&](mlir::Type type) -> mlir::Type { return type; }); - // This is necessary in order to convert CIR pointer types that are pointing - // to CIR types that we are lowering in this pass. - converter.addConversion([&](cir::PointerType type) -> mlir::Type { - mlir::Type loweredPointeeType = converter.convertType(type.getPointee()); - if (!loweredPointeeType) - return {}; - return cir::PointerType::get(type.getContext(), loweredPointeeType, - type.getAddrSpace()); - }); - converter.addConversion([&](cir::ArrayType type) -> mlir::Type { - mlir::Type loweredElementType = - converter.convertType(type.getElementType()); - if (!loweredElementType) - return {}; - return cir::ArrayType::get(loweredElementType, type.getSize()); - }); - - converter.addConversion([&](cir::DataMemberType type) -> mlir::Type { - mlir::Type abiType = - lowerModule.getCXXABI().lowerDataMemberType(type, converter); - return converter.convertType(abiType); - }); - converter.addConversion([&](cir::MethodType type) -> mlir::Type { - mlir::Type abiType = - lowerModule.getCXXABI().lowerMethodType(type, converter); - return converter.convertType(abiType); - }); - // This is necessary in order to convert CIR function types that have argument - // or return types that use CIR types that we are lowering in this pass. - converter.addConversion([&](cir::FuncType type) -> mlir::Type { - llvm::SmallVector<mlir::Type> loweredInputTypes; - loweredInputTypes.reserve(type.getNumInputs()); - if (mlir::failed( - converter.convertTypes(type.getInputs(), loweredInputTypes))) - return {}; - - mlir::Type loweredReturnType = converter.convertType(type.getReturnType()); - if (!loweredReturnType) - return {}; - - return cir::FuncType::get(loweredInputTypes, loweredReturnType, - /*isVarArg=*/type.getVarArg()); - }); -} +// A type to handle type conversion for the CXXABILowering pass. +class CIRABITypeConverter : public mlir::TypeConverter { +public: + CIRABITypeConverter(mlir::DataLayout &dataLayout, + cir::LowerModule &lowerModule) { + addConversion([&](mlir::Type type) -> mlir::Type { return type; }); + // This is necessary in order to convert CIR pointer types that are + // pointing to CIR types that we are lowering in this pass. + addConversion([&](cir::PointerType type) -> mlir::Type { + mlir::Type loweredPointeeType = convertType(type.getPointee()); + if (!loweredPointeeType) + return {}; + return cir::PointerType::get(type.getContext(), loweredPointeeType, + type.getAddrSpace()); + }); + addConversion([&](cir::ArrayType type) -> mlir::Type { + mlir::Type loweredElementType = convertType(type.getElementType()); + if (!loweredElementType) + return {}; + return cir::ArrayType::get(loweredElementType, type.getSize()); + }); + + addConversion([&](cir::DataMemberType type) -> mlir::Type { + mlir::Type abiType = + lowerModule.getCXXABI().lowerDataMemberType(type, *this); + return convertType(abiType); + }); + addConversion([&](cir::MethodType type) -> mlir::Type { + mlir::Type abiType = lowerModule.getCXXABI().lowerMethodType(type, *this); + return convertType(abiType); + }); + // This is necessary in order to convert CIR function types that have + // argument or return types that use CIR types that we are lowering in + // this pass. + addConversion([&](cir::FuncType type) -> mlir::Type { + llvm::SmallVector<mlir::Type> loweredInputTypes; + loweredInputTypes.reserve(type.getNumInputs()); + if (mlir::failed(convertTypes(type.getInputs(), loweredInputTypes))) + return {}; + + mlir::Type loweredReturnType = convertType(type.getReturnType()); + if (!loweredReturnType) + return {}; + + return cir::FuncType::get(loweredInputTypes, loweredReturnType, + /*isVarArg=*/type.getVarArg()); + }); + } +}; static void populateCXXABIConversionTarget(mlir::ConversionTarget &target, @@ -551,8 +550,7 @@ void CXXABILoweringPass::runOnOperation() { } mlir::DataLayout dataLayout(mod); - mlir::TypeConverter typeConverter; - prepareCXXABITypeConverter(typeConverter, dataLayout, *lowerModule); + CIRABITypeConverter typeConverter(dataLayout, *lowerModule); mlir::RewritePatternSet patterns(ctx); patterns.add<CIRGenericCXXABILoweringPattern>(patterns.getContext(), _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
