Merge pull request #8286 from tautschnig/bugfixes/c++-using

C++ front-end: permit GCC attributes in using declarations

Author: tautschnig

regression/cpp/using1/main.cpp

@@ -0,0 +1,13 @@
+#ifdef __GNUC__
+using type __attribute__((__nodebug__)) = int;
+
+typedef int my_int_t;
+namespace N
+{
+using ::my_int_t __attribute__((__using_if_exists__));
+}
+#endif
+
+int main(int argc, char *argv[])
+{
+}

regression/cpp/using1/test.desc

@@ -0,0 +1,8 @@
+CORE
+main.cpp
+-std=c++11
+^EXIT=0$
+^SIGNAL=0$
+--
+^warning: ignoring
+^CONVERSION ERROR$

src/cpp/parse.cpp

@@ -243,6 +243,7 @@ class Parser // NOLINT(readability/identifiers)
   bool rLinkageSpec(cpp_linkage_spect &);
   bool rNamespaceSpec(cpp_namespace_spect &);
   bool rUsing(cpp_usingt &);
+  bool rUsingOrTypedef(cpp_itemt &);
   bool rStaticAssert(cpp_static_assertt &);
   bool rLinkageBody(cpp_linkage_spect::itemst &);
   bool rTemplateDecl(cpp_declarationt &);
@@ -581,14 +582,8 @@ bool Parser::rDefinition(cpp_itemt &item)
     return rNamespaceSpec(item.make_namespace_spec());
   else if(t==TOK_INLINE && lex.LookAhead(1)==TOK_NAMESPACE)
     return rNamespaceSpec(item.make_namespace_spec());
-  else if(
-    t == TOK_USING && is_identifier(lex.LookAhead(1)) &&
-    lex.LookAhead(2) == '=')
-  {
-    return rTypedefUsing(item.make_declaration());
-  }
   else if(t==TOK_USING)
-    return rUsing(item.make_using());
+    return rUsingOrTypedef(item);
   else if(t==TOK_STATIC_ASSERT)
     return rStaticAssert(item.make_static_assert());
   else
@@ -668,6 +663,9 @@ bool Parser::rTypedefUsing(cpp_declarationt &declaration)
   std::cout << std::string(__indent, ' ') << "Parser::rTypedefUsing 2\n";
 #endif
 
+  if(!optAttribute(declaration.type()))
+    return false;
+
   if(lex.get_token(tk)!='=')
     return false;
 
@@ -901,12 +899,43 @@ bool Parser::rUsing(cpp_usingt &cpp_using)
   if(!rName(cpp_using.name()))
     return false;
 
+  // We will eventually need to record this attribute as Clang's
+  // __using_if_exists__ affects type checking.
+  typet discard;
+  if(!optAttribute(discard))
+    return false;
+
   if(lex.get_token(tk)!=';')
     return false;
 
   return true;
 }
 
+/*
+  USING Identifier '=' type.specifier ';'
+  | using.declaration
+*/
+bool Parser::rUsingOrTypedef(cpp_itemt &item)
+{
+  cpp_token_buffert::post pos = lex.Save();
+
+  cpp_tokent tk;
+  if(lex.get_token(tk) != TOK_USING)
+    return false;
+
+  typet discard;
+  if(
+    is_identifier(lex.get_token(tk)) && optAttribute(discard) &&
+    lex.LookAhead(0) == '=')
+  {
+    lex.Restore(pos);
+    return rTypedefUsing(item.make_declaration());
+  }
+
+  lex.Restore(pos);
+  return rUsing(item.make_using());
+}
+
 /*
   static_assert.declaration : STATIC_ASSERT ( expression , expression ) ';'
 */
@@ -4731,14 +4760,8 @@ bool Parser::rClassMember(cpp_itemt &member)
     return rTypedef(member.make_declaration());
   else if(t==TOK_TEMPLATE)
     return rTemplateDecl(member.make_declaration());
-  else if(
-    t == TOK_USING && is_identifier(lex.LookAhead(1)) &&
-    lex.LookAhead(2) == '=')
-  {
-    return rTypedefUsing(member.make_declaration());
-  }
   else if(t==TOK_USING)
-    return rUsing(member.make_using());
+    return rUsingOrTypedef(member);
   else if(t==TOK_STATIC_ASSERT)
     return rStaticAssert(member.make_static_assert());
   else