diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6a27cbb36b8f..fe1ccb57e484 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-05-11 Jason Merrill + + PR c++/48745 + * pt.c (value_dependent_expr_p): Handle CONSTRUCTOR. + 2011-05-11 Nathan Froyd * cp-tree.h (TYPENAME_TYPE_FULLNAME, TYPEOF_TYPE_EXPR): Use diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 5e2497796fd1..74d4cbf1edde 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 79919a2c5ce0..51aacc5fddbd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-05-11 Jason Merrill + + * g++.dg/cpp0x/sfinae22.C: New. + 2011-05-11 Tobias Burnus 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 000000000000..1c3efd2e079c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/sfinae22.C @@ -0,0 +1,23 @@ +// PR c++/48745 +// { dg-options -std=c++0x } + +template +struct add_rval_ref { + typedef T&& type; +}; + +template<> +struct add_rval_ref { + typedef void type; +}; + +template +typename add_rval_ref::type create(); + +template +decltype(T{create()...}, char()) f(int); + +template +char (&f(...))[2]; + +static_assert(sizeof(f(0)) != 1, "Error"); // #