diff options
Diffstat (limited to 'gcc/cp/class.c')
| -rw-r--r-- | gcc/cp/class.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c index bf92300..c30a44f 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -5547,10 +5547,16 @@ type_has_constexpr_destructor (tree t) static bool type_maybe_constexpr_destructor (tree t) { + /* Until C++20, only trivial destruction is constexpr. */ + if (TYPE_HAS_TRIVIAL_DESTRUCTOR (t)) + return true; + if (cxx_dialect < cxx20) + return false; if (CLASS_TYPE_P (t) && CLASSTYPE_LAZY_DESTRUCTOR (t)) /* Assume it's constexpr. */ return true; - return type_has_constexpr_destructor (t); + tree fn = CLASSTYPE_DESTRUCTOR (t); + return (fn && maybe_constexpr_fn (fn)); } /* Returns true iff class TYPE has a virtual destructor. */ @@ -5823,8 +5829,7 @@ finalize_literal_type_property (tree t) if (cxx_dialect < cxx11) CLASSTYPE_LITERAL_P (t) = false; else if (CLASSTYPE_LITERAL_P (t) - && TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t) - && (cxx_dialect < cxx20 || !type_maybe_constexpr_destructor (t))) + && !type_maybe_constexpr_destructor (t)) CLASSTYPE_LITERAL_P (t) = false; else if (CLASSTYPE_LITERAL_P (t) && LAMBDA_TYPE_P (t)) CLASSTYPE_LITERAL_P (t) = (cxx_dialect >= cxx17); |