Changes in / [8655363:4d689e2]

Location:

src

Files:

• AST/Attribute.cpp (modified) (1 diff)
• Validate/Autogen.cpp (modified) (1 diff)
• Validate/ReplaceTypedef.cpp (modified) (2 diffs)

src/AST/Attribute.cpp

@@ -38 +38 @@
 
 bool Attribute::isValidOnFuncParam() const {
-        // Attributes produce GCC errors when they appear on function
-        // parameters. This is an allow-list, switching to a forbid-list would
-        // have to at least mention:
-        // aligned
+        // attributes such as aligned, cleanup, etc. produce GCC errors when they appear
+        // on function parameters. Maintain here a whitelist of attribute names that are
+        // allowed to appear on parameters.
         std::string norm = normalizedName();
-        return norm == "unused" || norm == "noreturn" || norm == "vector_size";
+        return norm == "unused" || norm == "noreturn";
 }
 

src/Validate/Autogen.cpp

@@ -440 +440 @@
 
                 auto * paramType = ast::deepCopy( member->get_type() );
-                erase_if( paramType->attributes, []( ast::Attribute const * attr ){
-                        return !attr->isValidOnFuncParam();
-                } );
+                paramType->attributes.clear();
                 ast::ObjectDecl * param = new ast::ObjectDecl(
                         getLocation(), member->name, paramType );

src/Validate/ReplaceTypedef.cpp

@@ -25 +25 @@
 
 namespace {
+
+bool isNonParameterAttribute( ast::Attribute const * attr ) {
+        static const std::vector<std::string> bad_names = {
+                "aligned", "__aligned__",
+        };
+        for ( auto name : bad_names ) {
+                if ( name == attr->name ) {
+                        return true;
+                }
+        }
+        return false;
+}
 
 struct ReplaceTypedefCore final :
@@ -89 +101 @@
                 // by typedef. GCC appears to do the same thing.
                 if ( isAtFunctionTop ) {
-                        erase_if( ret->attributes, []( ast::Attribute const * attr ){
-                                return !attr->isValidOnFuncParam();
-                        } );
+                        erase_if( ret->attributes, isNonParameterAttribute );
                 }
                 for ( const auto & attribute : type->attributes ) {