From 7c5b407fa2f7dee7cfa663f7d5c4521fa4be00c8 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Mon, 16 Apr 2018 21:35:34 +0000 Subject: [PATCH] [PR c++/85039] no type definitions in builtin offsetof Types defined within a __builtin_offsetof argument don't always get properly recorded as members of their context types, so if they're anonymous, we may fail to assign them an anon type index for mangling and ICE. We shouldn't allow types to be introduced in __builtin_offsetof, I think, and Jason says the std committee agrees, so I've arranged for us to reject them. Even then, we still parse the definitions and attempt to assign mangled names to its member functions, so the ICE remains. Since we've already reported an error, we might as well complete the name assignment with an arbitrary index, thus avoiding the ICE. We used to have a test that expected to be able to define types in __builtin_offsetof; this patch removes that specific test. for gcc/cp/ChangeLog PR c++/85039 * parser.c (cp_parser_builtin_offset): Reject type definitions. * mangle.c (nested_anon_class_index): Avoid crash returning -1 if we've seen errors. for gcc/testsuite/ChangeLog PR c++/85039 * g++.dg/pr85039-1.C: New. * g++.dg/pr85039-2.C: New. * g++.dg/parse/semicolon3.C: Remove test_offsetof. From-SVN: r259423 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/mangle.c | 3 +++ gcc/cp/parser.c | 8 +++++++- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/g++.dg/parse/semicolon3.C | 7 ------- gcc/testsuite/g++.dg/pr85039-1.C | 17 +++++++++++++++++ gcc/testsuite/g++.dg/pr85039-2.C | 10 ++++++++++ 7 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/g++.dg/pr85039-1.C create mode 100644 gcc/testsuite/g++.dg/pr85039-2.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5f29b0c..954127f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2018-04-16 Alexandre Oliva + + PR c++/85039 + * parser.c (cp_parser_builtin_offset): Reject type definitions. + * mangle.c (nested_anon_class_index): Avoid crash returning -1 + if we've seen errors. + 2018-04-12 David Malcolm PR c++/85385 diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 94c4bed..a7f9d68 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -1623,6 +1623,9 @@ nested_anon_class_index (tree type) ++index; } + if (seen_error ()) + return -1; + gcc_unreachable (); } diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 8b1b271..bf46165f 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -9823,7 +9823,13 @@ cp_parser_builtin_offsetof (cp_parser *parser) parens.require_open (parser); /* Parse the type-id. */ location_t loc = cp_lexer_peek_token (parser->lexer)->location; - type = cp_parser_type_id (parser); + { + const char *saved_message = parser->type_definition_forbidden_message; + parser->type_definition_forbidden_message + = G_("types may not be defined within __builtin_offsetof"); + type = cp_parser_type_id (parser); + parser->type_definition_forbidden_message = saved_message; + } /* Look for the `,'. */ cp_parser_require (parser, CPP_COMMA, RT_COMMA); token = cp_lexer_peek_token (parser->lexer); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 31c576b..33258e6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2018-04-16 Alexandre Oliva + + PR c++/85039 + * g++.dg/pr85039-1.C: New. + * g++.dg/pr85039-2.C: New. + * g++.dg/parse/semicolon3.C: Remove test_offsetof. + 2018-04-16 Bill Schmidt PR target/85080 diff --git a/gcc/testsuite/g++.dg/parse/semicolon3.C b/gcc/testsuite/g++.dg/parse/semicolon3.C index 8a2b1ac..0d46be9 100644 --- a/gcc/testsuite/g++.dg/parse/semicolon3.C +++ b/gcc/testsuite/g++.dg/parse/semicolon3.C @@ -20,13 +20,6 @@ struct OK3 } // no complaints (s7); -__SIZE_TYPE__ -test_offsetof (void) -{ - // no complaints about a missing semicolon - return __builtin_offsetof (struct OK4 { int a; int b; }, b); -} - struct OK5 { int a; diff --git a/gcc/testsuite/g++.dg/pr85039-1.C b/gcc/testsuite/g++.dg/pr85039-1.C new file mode 100644 index 0000000..f57c8a2 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr85039-1.C @@ -0,0 +1,17 @@ +// { dg-do compile { target c++14 } } + +constexpr int a() { + return + __builtin_offsetof(struct { // { dg-error "types may not be defined" } + int i; + short b { + __builtin_offsetof(struct { // { dg-error "types may not be defined" } + int j; + struct c { // { dg-error "types may not be defined" } + void d() { + } + }; + }, j) + }; + }, i); +} diff --git a/gcc/testsuite/g++.dg/pr85039-2.C b/gcc/testsuite/g++.dg/pr85039-2.C new file mode 100644 index 0000000..e6d1632 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr85039-2.C @@ -0,0 +1,10 @@ +// { dg-do compile } + +struct d { + static d *b; +} * d::b(__builtin_offsetof(struct { // { dg-error "types may not be defined" } + int i; + struct a { // { dg-error "types may not be defined" } + int c() { return .1f; } + }; +}, i)); -- 2.7.4