PR c++/78774 - [6/7 Regression] ICE in constexpr string literals and templates

gcc/cp/ChangeLog:

	PR c++/78774
	* pt.c (convert_template_argument): Avoid assuming operand type
	is non-null since that of SCOPE_REF is not.

gcc/testsuite/ChangeLog:

	PR c++/78774
	* g++.dg/cpp1y/pr78774.C: New test.

From-SVN: r243683
This commit is contained in:
Martin Sebor 2016-12-15 03:08:14 +00:00 committed by Martin Sebor
parent edda2869d0
commit 1750f2a55a
4 changed files with 24 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2016-12-14 Martin Sebor <msebor@redhat.com>
PR c++/78774
* pt.c (convert_template_argument): Avoid assuming operand type
is non-null since that of SCOPE_REF is not.
2016-12-14 Martin Jambor <mjambor@suse.cz>
* parser.c: Include omp-general.h and omp-offload.h instead of

View File

@ -7379,9 +7379,10 @@ convert_template_argument (tree parm,
/* Reject template arguments that are references to built-in
functions with no library fallbacks. */
const_tree inner = TREE_OPERAND (val, 0);
if (TREE_CODE (TREE_TYPE (inner)) == REFERENCE_TYPE
&& TREE_CODE (TREE_TYPE (TREE_TYPE (inner))) == FUNCTION_TYPE
&& TREE_CODE (TREE_TYPE (inner)) == REFERENCE_TYPE
const_tree innertype = TREE_TYPE (inner);
if (innertype
&& TREE_CODE (innertype) == REFERENCE_TYPE
&& TREE_CODE (TREE_TYPE (innertype)) == FUNCTION_TYPE
&& 0 < TREE_OPERAND_LENGTH (inner)
&& reject_gcc_builtin (TREE_OPERAND (inner, 0)))
return error_mark_node;

View File

@ -1,3 +1,8 @@
2016-12-14 Martin Sebor <msebor@redhat.com>
PR c++/78774
* g++.dg/cpp1y/pr78774.C: New test.
2016-12-14 David Malcolm <dmalcolm@redhat.com>
PR target/78213

View File

@ -0,0 +1,9 @@
// PR c++/78774 - [6/7 Regression] ICE in constexpr string literals and
// templates
// { dg-do compile { target c++14 } }
template <int> struct ops {
template <int> struct A;
template <int *Ptr> using explode = typename A<*Ptr>::join;
};
template <typename Ts> typename ops<'\0'>::explode<Ts::join>::type a;