OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: r156022
This commit is contained in:
Dodji Seketeli 2010-01-18 21:18:49 +00:00 committed by Dodji Seketeli
parent a5cf630e39
commit ebea03e03e
4 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/cp/ChangeLog
View File

@ -1,3 +1,12 @@
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

7
gcc/cp/error.c
View File

@ -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);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
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

34
gcc/testsuite/g++.dg/template/error45.C Normal file
View File

@ -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());
}