aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/constexpr.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2018-01-18 15:02:06 -0500
committerJason Merrill <jason@gcc.gnu.org>2018-01-18 15:02:06 -0500
commitd3a9902e523f81f07e765b2553dde7019aa098fb (patch)
treed3b9be5a9d6abd0e5eccb746e15aa9ff96fabd0f /gcc/cp/constexpr.c
parentdac867c90a93d411f71a2ce960f61c0f637235ad (diff)
downloadgcc-d3a9902e523f81f07e765b2553dde7019aa098fb.zip
gcc-d3a9902e523f81f07e765b2553dde7019aa098fb.tar.gz
gcc-d3a9902e523f81f07e765b2553dde7019aa098fb.tar.bz2
PR c++/82461 - constexpr list-initialized member
* constexpr.c (potential_constant_expression_1): Check TARGET_EXPR_DIRECT_INIT_P. From-SVN: r256860
Diffstat (limited to 'gcc/cp/constexpr.c')
-rw-r--r--gcc/cp/constexpr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 8984613..9a548d2 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -5726,7 +5726,8 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now,
return RECUR (TREE_OPERAND (t, 1), want_rval);
case TARGET_EXPR:
- if (!literal_type_p (TREE_TYPE (t)))
+ if (!TARGET_EXPR_DIRECT_INIT_P (t)
+ && !literal_type_p (TREE_TYPE (t)))
{
if (flags & tf_error)
{