diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/error.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/error45.C | 34 |
4 files changed, 51 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ccb2afec9e4..5325a6c9e14 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,14 @@ 2010-01-18 Dodji Seketeli <dodji@redhat.com> + PR c++/42634 + * error.c (dump_template_parms): Use innermost template + arguments before calling count_non_default_template_args. + (count_non_default_template_args): We are being called with + template innermost arguments now. There is no need to ensure + that again. + +2010-01-18 Dodji Seketeli <dodji@redhat.com> + PR c++/42766 * cvt.c (build_expr_type_conversion): Look through OVERLOAD. diff --git a/gcc/cp/error.c b/gcc/cp/error.c index e0e5ae52ceb..54e96810f9b 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -165,8 +165,7 @@ dump_template_argument (tree arg, int flags) static int count_non_default_template_args (tree args, tree params, int flags) { - tree inner_args = INNERMOST_TEMPLATE_ARGS (args); - int n = TREE_VEC_LENGTH (inner_args); + int n = TREE_VEC_LENGTH (args); int last; if (params == NULL_TREE @@ -195,7 +194,7 @@ count_non_default_template_args (tree args, tree params, int flags) NULL_TREE, false, true); --processing_template_decl; } - if (!cp_tree_equal (TREE_VEC_ELT (inner_args, last), def)) + if (!cp_tree_equal (TREE_VEC_ELT (args, last), def)) break; } @@ -1492,9 +1491,9 @@ dump_template_parms (tree info, int primary, int flags) ? DECL_INNERMOST_TEMPLATE_PARMS (TI_TEMPLATE (info)) : NULL_TREE); + args = INNERMOST_TEMPLATE_ARGS (args); len = count_non_default_template_args (args, params, flags); - args = INNERMOST_TEMPLATE_ARGS (args); for (ix = 0; ix != len; ix++) { tree arg = TREE_VEC_ELT (args, ix); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 11a7540f571..53832515405 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2010-01-18 Dodji Seketeli <dodji@redhat.com> + PR c++/42634 + * g++.dg/template/error45.C: New test. + +2010-01-18 Dodji Seketeli <dodji@redhat.com> + PR c++/42766 * g++.dg/conversion/op6.C: New test. diff --git a/gcc/testsuite/g++.dg/template/error45.C b/gcc/testsuite/g++.dg/template/error45.C new file mode 100644 index 00000000000..f5332ee7144 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/error45.C @@ -0,0 +1,34 @@ +// Origin PR c++/42634 +// { dg-options "-g -std=gnu++0x" } +// { dg-do compile } + +template<typename T> T declval(); + +template<typename T, typename... Args> struct is_constructible { + template<typename T1, typename... Args1> static decltype(T1(declval<Args1>()...), char()) test(); + static const bool value = sizeof(test<T, Args...>()) == 1; +}; +template<bool> struct enable_if { + typedef void type; +}; +template<class T1, class T2> struct pair { + template<class U2, + class = typename enable_if<is_constructible<T2,U2&&>::value>::type + > + pair(const T1&, U2&&) { } +}; +struct string { + string() : p(0) {} + char* p; +}; + +struct Foo { + string s; + int i; +}; + +void f() +{ + pair<int, Foo>(1, Foo()); +} + |
