Skip to content

[CIR][Lowering] Lower delete array to LLVM #1588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3963,6 +3963,26 @@ mlir::LogicalResult CIRToLLVMGetBitfieldOpLowering::matchAndRewrite(
return mlir::success();
}

mlir::LogicalResult CIRToLLVMDeleteArrayOpLowering::matchAndRewrite(
cir::DeleteArrayOp op, OpAdaptor adaptor,
mlir::ConversionPatternRewriter &rewriter) const {
StringRef fnName = "_ZdaPv";

auto voidTy = rewriter.getType<mlir::LLVM::LLVMVoidType>();
auto llvmPtrTy = mlir::LLVM::LLVMPointerType::get(rewriter.getContext());

auto fnTy = mlir::LLVM::LLVMFunctionType::get(voidTy, {llvmPtrTy},
/*isVarArg=*/false);

getOrCreateLLVMFuncOp(rewriter, op, fnName, fnTy);

// Replace the operation with a call to _ZdaPv with the pointer argument
rewriter.replaceOpWithNewOp<mlir::LLVM::CallOp>(
op, mlir::TypeRange{}, fnName, mlir::ValueRange{adaptor.getAddress()});

return mlir::success();
}

mlir::LogicalResult CIRToLLVMIsConstantOpLowering::matchAndRewrite(
cir::IsConstantOp op, OpAdaptor adaptor,
mlir::ConversionPatternRewriter &rewriter) const {
Expand Down Expand Up @@ -4344,6 +4364,7 @@ void populateCIRToLLVMConversionPatterns(
CIRToLLVMGetGlobalOpLowering,
CIRToLLVMGetMemberOpLowering,
CIRToLLVMInsertMemberOpLowering,
CIRToLLVMDeleteArrayOpLowering,
CIRToLLVMIsConstantOpLowering,
CIRToLLVMIsFPClassOpLowering,
CIRToLLVMLinkerOptionsOpLowering,
Expand Down
10 changes: 10 additions & 0 deletions clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.h
Original file line number Diff line number Diff line change
Expand Up @@ -1099,6 +1099,16 @@ class CIRToLLVMGetBitfieldOpLowering
mlir::ConversionPatternRewriter &) const override;
};

class CIRToLLVMDeleteArrayOpLowering
: public mlir::OpConversionPattern<cir::DeleteArrayOp> {
public:
using mlir::OpConversionPattern<cir::DeleteArrayOp>::OpConversionPattern;

mlir::LogicalResult
matchAndRewrite(cir::DeleteArrayOp op, OpAdaptor adaptor,
mlir::ConversionPatternRewriter &rewriter) const override;
};

class CIRToLLVMIsConstantOpLowering
: public mlir::OpConversionPattern<cir::IsConstantOp> {
public:
Expand Down
19 changes: 19 additions & 0 deletions clang/test/CIR/Lowering/delete-array.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++20 -fclangir -emit-llvm -O0 %s -o %t.ll
// RUN: FileCheck --input-file=%t.ll %s --check-prefix=LLVM

void test_delete_array(int *ptr) {
delete[] ptr;
}

// LLVM: [[PTR:%[0-9]+]] = load ptr, ptr %{{[0-9]+}}, align 8
// LLVM-NEXT: call void @_ZdaPv(ptr [[PTR]])


int *newmem();
struct cls {
~cls();
};
cls::~cls() { delete[] newmem(); }

// LLVM: [[NEWMEM:%[0-9]+]] = call ptr @_Z6newmemv()
// LLVM-NEXT: call void @_ZdaPv(ptr [[NEWMEM]])
Loading