mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-24 03:59:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

pt.c (type_unification_real): Correct complain arg for tsubsting default template args.

Browse Source 
* pt.c (type_unification_real): Correct complain arg for tsubsting
	default template args.

From-SVN: r178651
This commit is contained in:
Jason Merrill 2011-09-07 13:11:37 -04:00 committed by Jason Merrill
parent 10e8dd8275
commit 30288f9aa2
7 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
2011-09-07 Jason Merrill <jason@redhat.com>
* pt.c (type_unification_real): Correct complain arg for tsubsting
default template args.
* pt.c (tsubst_aggr_type): Check TYPE_P before tsubsting.
2011-09-06 Jason Merrill <jason@redhat.com>

11
gcc/cp/pt.c
View File

@ -14804,6 +14804,10 @@ type_unification_real (tree tparms,
if (!subr)
{
tsubst_flags_t complain = (explain_p
? tf_warning_or_error
: tf_none);
/* Check to see if we need another pass before we start clearing
ARGUMENT_PACK_INCOMPLETE_P. */
for (i = 0; i < ntparms; i++)
@ -14854,11 +14858,8 @@ type_unification_real (tree tparms,
{
tree parm = TREE_VALUE (TREE_VEC_ELT (tparms, i));
tree arg = TREE_PURPOSE (TREE_VEC_ELT (tparms, i));
arg = tsubst_template_arg (arg, targs, tf_none, NULL_TREE);
arg = convert_template_argument (parm, arg, targs,
(explain_p
? tf_warning_or_error
: tf_none),
arg = tsubst_template_arg (arg, targs, complain, NULL_TREE);
arg = convert_template_argument (parm, arg, targs, complain,
i, NULL_TREE);
if (arg == error_mark_node)
return 1;

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2011-09-07 Jason Merrill <jason@redhat.com>
* g++.dg/cpp0x/sfinae11.C: Check for explanatory diagnostic.
2011-09-07 Georg-Johann Lay <avr@gjlay.de>
* gcc.dg/section1.c: Don't xfail for avr.

1
gcc/testsuite/g++.dg/cpp0x/sfinae11.C
View File

@ -52,5 +52,6 @@ int main()
noexcept( f1(z) ); // { dg-message "required" }
static_assert( noexcept( f2(z) ), "shall be ill-formed." ); // { dg-error "no match|could not convert" }
// { dg-error "no member" "" { target *-*-* } 54 }
noexcept( f3(z) ); // { dg-message "required" }
}

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2011-09-07 Jason Merrill <jason@redhat.com>
* testsuite/20_util/bind/ref_neg.cc: Adjust errors.
* testsuite/20_util/duration/cons/1_neg.cc: Adjust errors.
2011-09-06 Benjamin Kosnik <bkoz@redhat.com>
* include/std/tuple (_Tuple_impl::_M_head, _M_tail): Mark constexpr.

4
libstdc++-v3/testsuite/20_util/bind/ref_neg.cc
View File

@ -29,8 +29,8 @@ int inc(int& i) { return ++i; }
void test01()
{
const int dummy = 0;
std::bind(&inc, _1)(0); // { dg-error "no match" }
std::bind(&inc, std::ref(dummy))(); // { dg-error "no match" }
std::bind(&inc, _1)(0); // { dg-error "no match|rvalue" }
std::bind(&inc, std::ref(dummy))(); // { dg-error "no match|const" }
}
struct Inc

4
libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc
View File

@ -26,7 +26,7 @@
void
test01()
{
std::chrono::duration<int> d1(1.0); // { dg-error "no matching" }
std::chrono::duration<int> d1(1.0); // { dg-error "no matching|no type" }
}
void
@ -35,6 +35,6 @@ test02()
using namespace std::chrono;
duration<int, std::micro> d2(8);
duration<int, std::milli> d2_copy(d2); // { dg-error "no matching" }
duration<int, std::milli> d2_copy(d2); // { dg-error "no matching|no type" }
}