diff --git a/clang/lib/AST/ByteCode/Compiler.cpp b/clang/lib/AST/ByteCode/Compiler.cpp index 88515edb660a9..f0d047ad01632 100644 --- a/clang/lib/AST/ByteCode/Compiler.cpp +++ b/clang/lib/AST/ByteCode/Compiler.cpp @@ -5733,7 +5733,9 @@ bool Compiler::VisitCallExpr(const CallExpr *E) { if (FuncDecl->isUsableAsGlobalAllocationFunctionInConstantEvaluation()) { if (FuncDecl->getDeclName().isAnyOperatorNew()) return VisitBuiltinCallExpr(E, Builtin::BI__builtin_operator_new); - assert(FuncDecl->getDeclName().getCXXOverloadedOperator() == OO_Delete); + assert(FuncDecl->getDeclName().getCXXOverloadedOperator() == OO_Delete || + FuncDecl->getDeclName().getCXXOverloadedOperator() == + OO_Array_Delete); return VisitBuiltinCallExpr(E, Builtin::BI__builtin_operator_delete); } diff --git a/clang/test/AST/ByteCode/new-delete.cpp b/clang/test/AST/ByteCode/new-delete.cpp index b6e6d333a4bcb..22dc2e5d692e1 100644 --- a/clang/test/AST/ByteCode/new-delete.cpp +++ b/clang/test/AST/ByteCode/new-delete.cpp @@ -1217,6 +1217,21 @@ namespace ArrayDestSize { static_assert(dynarray(3, 2) == 'x'); // both-error {{constant expression}} both-note {{in call}} } +namespace OpertorArrayDelete { + struct S {}; + using State = S[2]; + constexpr unsigned run(const State *s) { + void *p; + p = operator new[](128); // both-note {{cannot allocate untyped memory}} + operator delete[](p); + return 42; + } + + constexpr State s[] = {}; + static_assert(run(s) == 42, ""); // both-error {{not an integral constant expression}} \ + // both-note {{in call to}} +} + #else /// Make sure we reject this prior to C++20 constexpr int a() { // both-error {{never produces a constant expression}}