From 355b42c5d9d58d266829d2e44528f7a5ca0eae37 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 1 Oct 2020 11:16:44 +0200 Subject: [PATCH] c++: Handle std::construct_at on automatic vars during constant evaluation [PR97195] As mentioned in the PR, we only support due to a bug in constant expressions std::construct_at on non-automatic variables, because we VERIFY_CONSTANT the second argument of placement new, which fails verification if it is an address of an automatic variable. The following patch fixes it by not performing that verification, the placement new evaluation later on will verify it after it is dereferenced. 2020-10-01 Jakub Jelinek PR c++/97195 * constexpr.c (cxx_eval_call_expression): Don't VERIFY_CONSTANT the second argument. * g++.dg/cpp2a/constexpr-new14.C: New test. (cherry picked from commit 2805fcb32660bc0cdcd5ba54310f1f02651e039f) --- gcc/cp/constexpr.c | 3 +- gcc/testsuite/g++.dg/cpp2a/constexpr-new14.C | 73 ++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/constexpr-new14.C diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 8ecff3694256..955c9023949d 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -2240,9 +2240,10 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t, tree arg = CALL_EXPR_ARG (t, i); arg = cxx_eval_constant_expression (ctx, arg, false, non_constant_p, overflow_p); - VERIFY_CONSTANT (arg); if (i == 1) arg1 = arg; + else + VERIFY_CONSTANT (arg); } gcc_assert (arg1); return arg1; diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-new14.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-new14.C new file mode 100644 index 000000000000..fd6f6075ef0c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-new14.C @@ -0,0 +1,73 @@ +// PR c++/97195 +// { dg-do compile { target c++20 } } + +namespace std +{ + typedef __SIZE_TYPE__ size_t; + + template + struct allocator + { + constexpr allocator () noexcept {} + + constexpr T *allocate (size_t n) + { return static_cast (::operator new (n * sizeof(T))); } + + constexpr void + deallocate (T *p, size_t n) + { ::operator delete (p); } + }; + + template + U __declval (int); + template + T __declval (long); + template + auto declval () noexcept -> decltype (__declval (0)); + + template + struct remove_reference + { typedef T type; }; + template + struct remove_reference + { typedef T type; }; + template + struct remove_reference + { typedef T type; }; + + template + constexpr T && + forward (typename std::remove_reference::type &t) noexcept + { return static_cast (t); } + + template + constexpr T && + forward (typename std::remove_reference::type &&t) noexcept + { return static_cast (t); } + + template + constexpr auto + construct_at (T *l, A &&... a) + noexcept (noexcept (::new ((void *) 0) T (std::declval ()...))) + -> decltype (::new ((void *) 0) T (std::declval ()...)) + { return ::new ((void *) l) T (std::forward (a)...); } + + template + constexpr inline void + destroy_at (T *l) + { l->~T (); } +} + +inline void *operator new (std::size_t, void *p) noexcept +{ return p; } + +constexpr bool +foo () +{ + int a = 5; + int *p = std::construct_at (&a, -1); + if (p[0] != -1) + throw 1; + return true; +} +constexpr bool b = foo (); -- 2.47.2