From f1eac182405b9540c9ddecc9d72459fe82aa3f61 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 21 Jan 2015 15:15:35 -0500 Subject: [PATCH] re PR c++/64647 ([C++14] std::__max_element contains code not allowed in constexpr function) PR c++/64647 * constexpr.c (ensure_literal_type_for_constexpr_object): Don't give a hard error in a template instantiation. From-SVN: r219965 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/constexpr.c | 16 ++++++++++----- gcc/testsuite/g++.dg/cpp1y/constexpr-local3.C | 20 +++++++++++++++++++ 3 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/constexpr-local3.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d5b3cd8ad43..526742c0bce 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-01-21 Jason Merrill + + PR c++/64647 + * constexpr.c (ensure_literal_type_for_constexpr_object): Don't + give a hard error in a template instantiation. + 2015-01-21 Richard Biener PR middle-end/64313 diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 0d474245d36..decc84d301f 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -102,15 +102,21 @@ ensure_literal_type_for_constexpr_object (tree decl) else if (!literal_type_p (type)) { if (DECL_DECLARED_CONSTEXPR_P (decl)) - error ("the type %qT of constexpr variable %qD is not literal", - type, decl); + { + error ("the type %qT of constexpr variable %qD is not literal", + type, decl); + explain_non_literal_class (type); + } else { - error ("variable %qD of non-literal type %qT in % " - "function", decl, type); + if (!DECL_TEMPLATE_INSTANTIATION (current_function_decl)) + { + error ("variable %qD of non-literal type %qT in % " + "function", decl, type); + explain_non_literal_class (type); + } cp_function_chain->invalid_constexpr = true; } - explain_non_literal_class (type); return NULL; } } diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-local3.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-local3.C new file mode 100644 index 00000000000..76d4b55c416 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/constexpr-local3.C @@ -0,0 +1,20 @@ +// PR c++/64647 +// { dg-do compile { target c++14 } } + +template +constexpr T foo(T t) +{ + T tt = t; + return tt; +} + +struct X +{ + X() { } +}; + +int main() +{ + X x; + foo(x); +} -- 2.30.2