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

re PR c++/67142 ([C++1z] ICE: tree check: expected template_decl, have field_decl in equal, at cp/pt.c:1665) 

PR c++/67142
	* pt.c (equal): Make sure tmpl is actually a template.

From-SVN: r226737
This commit is contained in:
Jason Merrill 2015-08-08 18:01:21 -04:00 committed by Jason Merrill
parent a2dfb56374
commit d6729a4291
3 changed files with 22 additions and 0 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 @@
2015-08-08 Jason Merrill <jason@redhat.com>
PR c++/67142
* pt.c (equal): Make sure tmpl is actually a template.
PR c++/67114
* call.c (joust): Only call more_constrained on decls.

2
gcc/cp/pt.c
View File

@ -1662,6 +1662,8 @@ spec_hasher::equal (spec_entry *e1, spec_entry *e2)
equal = (e1->tmpl == e2->tmpl
&& comp_template_args (e1->args, e2->args));
if (equal && flag_concepts
/* tmpl could be a FIELD_DECL for a capture pack. */
&& TREE_CODE (e1->tmpl) == TEMPLATE_DECL
&& VAR_P (DECL_TEMPLATE_RESULT (e1->tmpl))
&& uses_template_parms (e1->args))
{

17
gcc/testsuite/g++.dg/cpp1z/regress2.C Normal file
View File

@ -0,0 +1,17 @@
// PR c++/67142
// { dg-options -std=c++1z }
namespace detail {
template <int> int split_at;
}
struct A {
decltype(0) operator()();
};
template <typename> A make;
struct Tuple;
auto check =
[](auto, auto, auto) { [](auto... xs) { [=] { make<Tuple>(xs...); }; }(); };
int main() {
namespace vd = detail;
check(vd::split_at<0>, make<Tuple>, make<Tuple>);
}