diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-07 21:47:53 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-07 21:47:53 +0000 |
| commit | ae813c19eeb8890a02102839c05faa9d6e27e0a2 (patch) | |
| tree | 415eb405524169e42540258b6617fbe16cdbd72a | |
| parent | de129274f74495cfe73e20c433b27a2038a18706 (diff) | |
| download | ppe42-gcc-ae813c19eeb8890a02102839c05faa9d6e27e0a2.tar.gz ppe42-gcc-ae813c19eeb8890a02102839c05faa9d6e27e0a2.zip | |
PR c++/48452
* typeck.c (build_x_compound_expr_from_list): Return error_mark_node
in SFINAE context.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172147 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/sfinae10.C | 18 |
4 files changed, 26 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 976c7fb6f65..04b9c402723 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2011-04-07 Jason Merrill <jason@redhat.com> + PR c++/48452 + * typeck.c (build_x_compound_expr_from_list): Return error_mark_node + in SFINAE context. + PR c++/48450 * call.c (resolve_args): Take complain. (build_new_function_call, build_operator_new_call): Pass it. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 8e3796e2757..ecd7d41fc72 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -5472,6 +5472,8 @@ build_x_compound_expr_from_list (tree list, expr_list_kind exp, default: gcc_unreachable (); } + else + return error_mark_node; for (list = TREE_CHAIN (list); list; list = TREE_CHAIN (list)) expr = build_x_compound_expr (expr, TREE_VALUE (list), diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dcdd32d9895..38f097208e5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,7 @@ 2011-04-07 Jason Merrill <jason@redhat.com> + * g++.dg/cpp0x/sfinae10.C: New. + * g++.dg/cpp0x/sfinae9.C: New. * c-c++-common/Wcast-qual-1.c: Move here from... diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae10.C b/gcc/testsuite/g++.dg/cpp0x/sfinae10.C new file mode 100644 index 00000000000..ede8b704245 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/sfinae10.C @@ -0,0 +1,18 @@ +// PR c++/48452 +// { dg-options -std=c++0x } +namespace std { + template <class T> T&& declval(); +} + +template<class T, class... Args> +decltype(T(std::declval<Args>()...), char()) f(int); + +template<class, class...> +char (&f(...))[2]; + +struct A { virtual ~A() = 0; }; +struct B {}; + +static_assert(sizeof(f<A, int, int>(0)) != 1, "Error"); // a +static_assert(sizeof(f<B, void, int>(0)) != 1, "Error"); // b +static_assert(sizeof(f<void, int, int>(0)) != 1, "Error"); // c |
