From cb3c050e515c697b2b69991ce9c7a770e301ac92 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sat, 16 Mar 2013 22:35:50 -0400 Subject: [PATCH] re PR c++/54946 (ICE on template parameter from cast char-pointer in C++11 constexpr struct) PR c++/54946 * pt.c (convert_nontype_argument): Handle invalid pointer. From-SVN: r196731 --- gcc/cp/ChangeLog | 3 ++ gcc/cp/pt.c | 29 +++++++++++++------ .../g++.dg/cpp0x/constexpr-template5.C | 6 ++++ 3 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-template5.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index de8f0307f2d..45c5d2887ab 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2013-03-16 Jason Merrill + PR c++/54946 + * pt.c (convert_nontype_argument): Handle invalid pointer. + * parser.c (cp_parser_lambda_expression): Use nreverse. PR c++/56447 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 126e110fc20..c07ed3244cf 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5553,15 +5553,19 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain) qualification conversion. Let's strip everything. */ else if (TREE_CODE (expr) == NOP_EXPR && TYPE_PTROBV_P (type)) { - STRIP_NOPS (expr); - gcc_assert (TREE_CODE (expr) == ADDR_EXPR); - gcc_assert (TREE_CODE (TREE_TYPE (expr)) == POINTER_TYPE); - /* Skip the ADDR_EXPR only if it is part of the decay for - an array. Otherwise, it is part of the original argument - in the source code. */ - if (TREE_CODE (TREE_TYPE (TREE_OPERAND (expr, 0))) == ARRAY_TYPE) - expr = TREE_OPERAND (expr, 0); - expr_type = TREE_TYPE (expr); + tree probe = expr; + STRIP_NOPS (probe); + if (TREE_CODE (probe) == ADDR_EXPR + && TREE_CODE (TREE_TYPE (probe)) == POINTER_TYPE) + { + /* Skip the ADDR_EXPR only if it is part of the decay for + an array. Otherwise, it is part of the original argument + in the source code. */ + if (TREE_CODE (TREE_TYPE (TREE_OPERAND (probe, 0))) == ARRAY_TYPE) + probe = TREE_OPERAND (probe, 0); + expr = probe; + expr_type = TREE_TYPE (expr); + } } /* [temp.arg.nontype]/5, bullet 1 @@ -5640,6 +5644,13 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain) expr, expr); return NULL_TREE; } + if (POINTER_TYPE_P (expr_type)) + { + error ("%qE is not a valid template argument for %qT" + "because it is not the address of a variable", + expr, type); + return NULL_TREE; + } /* Other values, like integer constants, might be valid non-type arguments of some other type. */ return error_mark_node; diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-template5.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-template5.C new file mode 100644 index 00000000000..aa80658036d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-template5.C @@ -0,0 +1,6 @@ +// PR c++/54946 +// { dg-do compile { target c++11 } } + +template static void testfunc(); +constexpr struct testtype { const char* str; } test = { "abc"} ; +void (*functionpointer)() = testfunc<(const char*) test.str>; // { dg-error "" } -- 2.30.2