[clang][bytecode] Loosen an assertion about operator delete#200575
Merged
Conversation
We may also see OO_Array_Delete here.
|
@llvm/pr-subscribers-clang Author: Timm Baeder (tbaederr) ChangesWe may also see OO_Array_Delete here. Full diff: https://github.com/llvm/llvm-project/pull/200575.diff 2 Files Affected:
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<Emitter>::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<char>(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}}
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We may also see OO_Array_Delete here.