diff options
| author | Jason Merrill <jason@redhat.com> | 2011-05-11 17:29:35 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-05-11 17:29:35 -0400 |
| commit | 3e475d30a363db90039aec1239fcfc1a15e202aa (patch) | |
| tree | a8b16159a621db2751e836198a5c16ae09b93deb /gcc | |
| parent | 0126595fee486221f58aa7e5f46064b194337225 (diff) | |
| download | gcc-3e475d30a363db90039aec1239fcfc1a15e202aa.zip gcc-3e475d30a363db90039aec1239fcfc1a15e202aa.tar.gz gcc-3e475d30a363db90039aec1239fcfc1a15e202aa.tar.bz2 | |
re PR c++/48745 ([C++0x] Segmentation fault with list-initialization, void initializers and variadics)
PR c++/48745
* pt.c (value_dependent_expr_p): Handle CONSTRUCTOR.
From-SVN: r173678
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/sfinae22.C | 23 |
4 files changed, 42 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6a27cbb..fe1ccb5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-05-11 Jason Merrill <jason@redhat.com> + + PR c++/48745 + * pt.c (value_dependent_expr_p): Handle CONSTRUCTOR. + 2011-05-11 Nathan Froyd <froydnj@codesourcery.com> * cp-tree.h (TYPENAME_TYPE_FULLNAME, TYPEOF_TYPE_EXPR): Use diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 5e24977..74d4cbf 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -18273,6 +18273,16 @@ value_dependent_expression_p (tree expression) type-dependent. */ return type_dependent_expression_p (expression); + case CONSTRUCTOR: + { + unsigned ix; + tree val; + FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (expression), ix, val) + if (value_dependent_expression_p (val)) + return true; + return false; + } + default: /* A constant expression is value-dependent if any subexpression is value-dependent. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 79919a2..51aacc5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-05-11 Jason Merrill <jason@redhat.com> + + * g++.dg/cpp0x/sfinae22.C: New. + 2011-05-11 Tobias Burnus <burnus@net-b.de> PR fortran/48889 diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae22.C b/gcc/testsuite/g++.dg/cpp0x/sfinae22.C new file mode 100644 index 0000000..1c3efd2e --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/sfinae22.C @@ -0,0 +1,23 @@ +// PR c++/48745 +// { dg-options -std=c++0x } + +template<class T> +struct add_rval_ref { + typedef T&& type; +}; + +template<> +struct add_rval_ref<void> { + typedef void type; +}; + +template<class T> +typename add_rval_ref<T>::type create(); + +template<class T, class... Args> +decltype(T{create<Args>()...}, char()) f(int); + +template<class, class...> +char (&f(...))[2]; + +static_assert(sizeof(f<int, void>(0)) != 1, "Error"); // # |