diff options
| author | Jason Merrill <jason@redhat.com> | 2011-04-13 10:34:05 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-04-13 10:34:05 -0400 |
| commit | ba9c349ec817c21ef7a72455a240cdc8f2c4926d (patch) | |
| tree | 5a9801136f60b7ac6e79940996b56da6b7e6d023 | |
| parent | 094d76619206390a925563a063b50bfcf3a88bbd (diff) | |
| download | gcc-ba9c349ec817c21ef7a72455a240cdc8f2c4926d.zip gcc-ba9c349ec817c21ef7a72455a240cdc8f2c4926d.tar.gz gcc-ba9c349ec817c21ef7a72455a240cdc8f2c4926d.tar.bz2 | |
pt.c (tsubst_copy_and_build): Don't complain about unqualified lookup failing if we're still in a template.
* pt.c (tsubst_copy_and_build) [CALL_EXPR]: Don't complain about
unqualified lookup failing if we're still in a template.
From-SVN: r172372
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/sfinae13.C | 20 |
4 files changed, 32 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 63dbaf0..f144d50 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-04-13 Jason Merrill <jason@redhat.com> + + PR c++/48581 + * pt.c (tsubst_copy_and_build) [CALL_EXPR]: Don't complain about + unqualified lookup failing if we're still in a template. + 2011-04-12 Nathan Froyd <froydnj@codesourcery.com> * cp-lang.c (cp_init_ts): Call cp_common_init_ts. Move diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 208ff2b..3356e75 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -12938,7 +12938,8 @@ tsubst_copy_and_build (tree t, && !any_type_dependent_arguments_p (call_args)) function = perform_koenig_lookup (function, call_args, false); - if (TREE_CODE (function) == IDENTIFIER_NODE) + if (TREE_CODE (function) == IDENTIFIER_NODE + && !processing_template_decl) { unqualified_name_lookup_error (function); release_tree_vector (call_args); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5904635..e740808 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-04-13 Jason Merrill <jason@redhat.com> + + * g++.dg/cpp0x/sfinae13.C: New. + 2011-04-13 Uros Bizjak <ubizjak@gmail.com> * gcc.target/i386/sse2-init-v2di-2.c: Update scan pattern. diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae13.C b/gcc/testsuite/g++.dg/cpp0x/sfinae13.C new file mode 100644 index 0000000..465df2d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/sfinae13.C @@ -0,0 +1,20 @@ +// PR c++/48581 +// { dg-options -std=c++0x } + +template<class T> +T&& create(); + +template<class T, + class = decltype(foo(create<T>())) +> +auto f(int) -> char; + +template<class> +auto f(...) -> char (&)[2]; + +struct S {}; +void foo(S); + +static_assert(sizeof(f<S>(0)) == 1, "Error"); // (#) + +int main() {} |