diff options
| author | Dodji Seketeli <dodji@redhat.com> | 2010-01-13 20:06:26 +0000 |
|---|---|---|
| committer | Dodji Seketeli <dodji@gcc.gnu.org> | 2010-01-13 21:06:26 +0100 |
| commit | a5859aaf073f326545266b691f5d74fc0f2f0f11 (patch) | |
| tree | 31116fc0e3472ae6d75eb188178fc8614fbf05db | |
| parent | 6cca15ea851ee526607e6e0ed51d48a40a9ec9df (diff) | |
| download | gcc-a5859aaf073f326545266b691f5d74fc0f2f0f11.zip gcc-a5859aaf073f326545266b691f5d74fc0f2f0f11.tar.gz gcc-a5859aaf073f326545266b691f5d74fc0f2f0f11.tar.bz2 | |
re PR c++/42634 (ICE with -g -O2 -std=c++0x in copy_fn_p, at cp/decl.c:9973)
Fix PR c++/42634
gcc/cp/ChangeLog:
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.
gcc/testsuite/ChangeLog:
PR c++/42634
* g++.dg/template/error45.C: New test.
From-SVN: r155868
| -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 | 35 |
4 files changed, 52 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 07a3486..11fa60d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2010-01-13 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-07 Dodji Seketeli <dodji@redhat.com> c++/40155 diff --git a/gcc/cp/error.c b/gcc/cp/error.c index e0e5ae5..54e9681 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 5bce27b..85dd4e0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-01-13 Dodji Seketeli <dodji@redhat.com> + + PR c++/42634 + * g++.dg/template/error45.C: New test. + 2010-01-13 Martin Jambor <mjambor@suse.cz> PR tree-optimization/42704 diff --git a/gcc/testsuite/g++.dg/template/error45.C b/gcc/testsuite/g++.dg/template/error45.C new file mode 100644 index 0000000..3bd8fb4 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/error45.C @@ -0,0 +1,35 @@ +// Contributed by Dodji Seketeli <dodji@redhat.com> +// 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()); +} + |