procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: Fix ICE in tsubst_copy with parenthesized expression [PR93299]

Browse source 
Since e4511ca2e9 force_paren_expr can create
a VIEW_CONVERT_EXPR so that we have something to set REF_PARENTHESIZED_P
on, while not making the expression dependent.  But tsubst_copy can't cope
with such a VIEW_CONVERT_EXPR, because it's not location_wrapper_p, or
a TEMPLATE_PARM_INDEX wrapped in a VIEW_CONVERT_EXPR.

I think we need to teach tsubst_copy how to handle it.  Setting
EXPR_LOCATION_WRAPPER_P in force_paren_expr would make the ICE go away
too, but tsubst_copy would lose the REF_PARENTHESIZED_P flag.

2020-01-24  Marek Polacek  <polacek@redhat.com>

	PR c++/93299 - ICE in tsubst_copy with parenthesized expression.
	* pt.c (tsubst_copy): Handle a REF_PARENTHESIZED_P VIEW_CONVERT_EXPR.

	* g++.dg/cpp1y/paren5.C: New test.
This commit is contained in:
Marek Polacek 2020-01-17 15:17:42 -05:00
parent 7c75a2a3bf
commit d54a86cd92
4 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/ChangeLog
View file

@ -1,3 +1,8 @@
2020-01-24 Marek Polacek <polacek@redhat.com>
PR c++/93299 - ICE in tsubst_copy with parenthesized expression.
* pt.c (tsubst_copy): Handle a REF_PARENTHESIZED_P VIEW_CONVERT_EXPR.
2020-01-24 Jason Merrill <jason@redhat.com>
PR c++/92852 - ICE with generic lambda and reference var.

8
gcc/cp/pt.c
View file

@ -16423,6 +16423,14 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl)
return op;
}
}
/* force_paren_expr can also create a VIEW_CONVERT_EXPR. */
else if (code == VIEW_CONVERT_EXPR && REF_PARENTHESIZED_P (t))
{
op = tsubst_copy (op, args, complain, in_decl);
op = build1 (code, TREE_TYPE (op), op);
REF_PARENTHESIZED_P (op) = true;
return op;
}
/* We shouldn't see any other uses of these in templates. */
gcc_unreachable ();
}

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2020-01-24 Marek Polacek <polacek@redhat.com>
PR c++/93299 - ICE in tsubst_copy with parenthesized expression.
* g++.dg/cpp1y/paren5.C: New test.
2020-01-24 Sandra Loosemore <sandra@codesourcery.com>
* g++.dg/cpp0x/constexpr-odr1.C: Add -fdelete-null-pointer-checks.

12
gcc/testsuite/g++.dg/cpp1y/paren5.C Normal file
View file

@ -0,0 +1,12 @@
// PR c++/93299 - ICE in tsubst_copy with parenthesized expression.
// { dg-do compile { target c++14 } }
template <typename> struct A {
enum { b = 8 };
};
template <int> struct __attribute__((aligned((A<int>::b)))) D { };
struct S : D<0> { };
template <int N> struct __attribute__((aligned((A<int>::b) + N))) D2 { };
struct S2 : D2<0> { };