Author: Timm Baeder Date: 2026-06-08T08:42:33+02:00 New Revision: 2b40c303e79f64c5c7642032554eda026594d604
URL: https://github.com/llvm/llvm-project/commit/2b40c303e79f64c5c7642032554eda026594d604 DIFF: https://github.com/llvm/llvm-project/commit/2b40c303e79f64c5c7642032554eda026594d604.diff LOG: [clang][bytecode] Diagnose negative AllocCN element counts (#202108) Just like we do in AllocN. Added: Modified: clang/lib/AST/ByteCode/Interp.h clang/test/AST/ByteCode/new-delete.cpp Removed: ################################################################################ diff --git a/clang/lib/AST/ByteCode/Interp.h b/clang/lib/AST/ByteCode/Interp.h index fa77e19afce66..d2ca122d0e805 100644 --- a/clang/lib/AST/ByteCode/Interp.h +++ b/clang/lib/AST/ByteCode/Interp.h @@ -3894,7 +3894,15 @@ inline bool AllocCN(InterpState &S, CodePtr OpPC, const Descriptor *ElementDesc, S.Stk.push<Pointer>(0, ElementDesc); return true; } - assert(NumElements.isPositive()); + if (NumElements.isNegative()) { + if (!IsNoThrow) { + S.FFDiag(S.Current->getSource(OpPC), diag::note_constexpr_new_negative) + << NumElements.toDiagnosticString(S.getASTContext()); + return false; + } + S.Stk.push<Pointer>(0, nullptr); + return true; + } if (!CheckArraySize(S, OpPC, static_cast<uint64_t>(NumElements))) return false; diff --git a/clang/test/AST/ByteCode/new-delete.cpp b/clang/test/AST/ByteCode/new-delete.cpp index f31851c98213c..7481eccd2c03a 100644 --- a/clang/test/AST/ByteCode/new-delete.cpp +++ b/clang/test/AST/ByteCode/new-delete.cpp @@ -1101,12 +1101,18 @@ namespace BaseCompare { } -namespace NegativeArraySize { +namespace NegativeArraySize { constexpr void f() { // both-error {{constexpr function never produces a constant expression}} int x = -1; - int *p = new int[x]; //both-note {{cannot allocate array; evaluated array bound -1 is negative}} + int *p = new int[x]; //both-note {{cannot allocate array; evaluated array bound -1 is negative}} } -} // namespace NegativeArraySize + + struct S {}; + constexpr void f1() { // both-error {{constexpr function never produces a constant expression}} + int x = -1; + int *p = new int[x]; //both-note {{cannot allocate array; evaluated array bound -1 is negative}} + } +} namespace NewNegSizeNothrow { constexpr int get_neg_size() { _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
