aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/parser.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2017-02-20 01:05:08 -0500
committerJason Merrill <jason@gcc.gnu.org>2017-02-20 01:05:08 -0500
commitde59c92b44f5e67a90268e2d0f6f3efd6c8e3354 (patch)
treed7c91db51add3280adf8cbc042c28e515b0a3de3 /gcc/cp/parser.c
parentb80dfe4441b689217cb3aefbc24c90d97b17d154 (diff)
downloadgcc-de59c92b44f5e67a90268e2d0f6f3efd6c8e3354.zip
gcc-de59c92b44f5e67a90268e2d0f6f3efd6c8e3354.tar.gz
gcc-de59c92b44f5e67a90268e2d0f6f3efd6c8e3354.tar.bz2
PR c++/79580 - ICE with compound literal
* parser.c (cp_parser_class_head): If we're in the middle of an expression, use ts_within_enclosing_non_class. From-SVN: r245587
Diffstat (limited to 'gcc/cp/parser.c')
-rw-r--r--gcc/cp/parser.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index feeafce..4656b4f 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -22771,7 +22771,10 @@ cp_parser_class_head (cp_parser* parser,
/* If the class was unnamed, create a dummy name. */
if (!id)
id = make_anon_name ();
- type = xref_tag (class_key, id, /*tag_scope=*/ts_current,
+ tag_scope tag_scope = (parser->in_type_id_in_expr_p
+ ? ts_within_enclosing_non_class
+ : ts_current);
+ type = xref_tag (class_key, id, tag_scope,
parser->num_template_parameter_lists);
}