Author: Timm Baeder Date: 2025-04-27T08:57:57+02:00 New Revision: 031101c66f152a1885ece1d7620071cb049edf51
URL: https://github.com/llvm/llvm-project/commit/031101c66f152a1885ece1d7620071cb049edf51 DIFF: https://github.com/llvm/llvm-project/commit/031101c66f152a1885ece1d7620071cb049edf51.diff LOG: [clang][bytecode] Diagnose delete of non-heap-allocated blocks (#137475) With std::allocator::deallocate() calls Added: Modified: clang/lib/AST/ByteCode/InterpBuiltin.cpp clang/test/AST/ByteCode/new-delete.cpp Removed: ################################################################################ diff --git a/clang/lib/AST/ByteCode/InterpBuiltin.cpp b/clang/lib/AST/ByteCode/InterpBuiltin.cpp index 770511ff76bb0..045e79c3c561d 100644 --- a/clang/lib/AST/ByteCode/InterpBuiltin.cpp +++ b/clang/lib/AST/ByteCode/InterpBuiltin.cpp @@ -1641,6 +1641,13 @@ static bool interp__builtin_operator_delete(InterpState &S, CodePtr OpPC, Source = Ptr.getDeclDesc()->asExpr(); BlockToDelete = Ptr.block(); + + if (!BlockToDelete->isDynamic()) { + S.FFDiag(Call, diag::note_constexpr_delete_not_heap_alloc) + << Ptr.toDiagnosticString(S.getASTContext()); + if (const auto *D = Ptr.getFieldDesc()->asDecl()) + S.Note(D->getLocation(), diag::note_declared_at); + } } assert(BlockToDelete); diff --git a/clang/test/AST/ByteCode/new-delete.cpp b/clang/test/AST/ByteCode/new-delete.cpp index e1b81e9a7963e..21d65461c79c7 100644 --- a/clang/test/AST/ByteCode/new-delete.cpp +++ b/clang/test/AST/ByteCode/new-delete.cpp @@ -610,7 +610,8 @@ namespace std { } constexpr void deallocate(void *p) { __builtin_operator_delete(p); // both-note 2{{std::allocator<...>::deallocate' used to delete pointer to object allocated with 'new'}} \ - // both-note {{used to delete a null pointer}} + // both-note {{used to delete a null pointer}} \ + // both-note {{delete of pointer '&no_deallocate_nonalloc' that does not point to a heap-allocated object}} } }; template<typename T, typename ...Args> @@ -1004,6 +1005,10 @@ namespace WrongFrame { } +constexpr int no_deallocate_nonalloc = (std::allocator<int>().deallocate((int*)&no_deallocate_nonalloc), 1); // both-error {{constant expression}} \ + // both-note {{in call}} \ + // both-note {{declared here}} + #else /// Make sure we reject this prior to C++20 constexpr int a() { // both-error {{never produces a constant expression}} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
