diff options
| author | Dodji Seketeli <dodji@redhat.com> | 2011-03-08 22:02:59 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-03-08 17:02:59 -0500 |
| commit | 918f238e7f736ee291d76e77fcefdaee761bf167 (patch) | |
| tree | 9e34e9175aa63544f2ab93ee0e71a2246845d64a | |
| parent | ef78aed645ba8b781a9a78412669738dc7871c6a (diff) | |
| download | gcc-918f238e7f736ee291d76e77fcefdaee761bf167.zip gcc-918f238e7f736ee291d76e77fcefdaee761bf167.tar.gz gcc-918f238e7f736ee291d76e77fcefdaee761bf167.tar.bz2 | |
re PR c++/47705 (internal compiler error: in convert_nontype_argument, at cp/pt.c:5006)
PR c++/47705
* pt.c (convert_nontype_argument): Only call decay_conversion on
arrays.
From-SVN: r170791
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 26 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/nontype21.C | 2 |
3 files changed, 18 insertions, 16 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ab0d3b4..68f04e1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-03-08 Dodji Seketeli <dodji@redhat.com> + + PR c++/47705 + * pt.c (convert_nontype_argument): Only call decay_conversion on + arrays. + 2011-03-08 Jason Merrill <jason@redhat.com> PR c++/47488 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index cda9df8..2ca2cd0 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5314,7 +5314,8 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain) /* Add the ADDR_EXPR now for the benefit of value_dependent_expression_p. */ - if (TYPE_PTROBV_P (type)) + if (TYPE_PTROBV_P (type) + && TREE_CODE (TREE_TYPE (expr)) == ARRAY_TYPE) expr = decay_conversion (expr); /* If we are in a template, EXPR may be non-dependent, but still @@ -5369,20 +5370,15 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain) qualification conversion. Let's strip everything. */ else if (TYPE_PTROBV_P (type)) { - tree sub = expr; - STRIP_NOPS (sub); - if (TREE_CODE (sub) == ADDR_EXPR) - { - gcc_assert (TREE_CODE (TREE_TYPE (sub)) == 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 (sub, 0))) == ARRAY_TYPE) - expr = TREE_OPERAND (sub, 0); - else - expr = sub; - expr_type = TREE_TYPE (expr); - } + 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); } } diff --git a/gcc/testsuite/g++.dg/template/nontype21.C b/gcc/testsuite/g++.dg/template/nontype21.C index c0f5319..69cab54 100644 --- a/gcc/testsuite/g++.dg/template/nontype21.C +++ b/gcc/testsuite/g++.dg/template/nontype21.C @@ -4,4 +4,4 @@ template<char const * const x> class Something { }; extern char const xyz; -class SomethingElse:public Something<xyz> { }; // { dg-error "const char *" } +class SomethingElse:public Something<xyz> { }; // { dg-error "xyz. is a variable" } |