From 7c5b407fa2f7dee7cfa663f7d5c4521fa4be00c8 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Mon, 16 Apr 2018 21:35:34 +0000 Subject: [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/mangle.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gcc/cp/mangle.c') 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 (); } -- cgit v1.1