Changes in / [da9a27c:2aa25cc2]

File:

• src/SymTab/Validate.cc (modified) (2 diffs)

src/SymTab/Validate.cc

@@ -960 +960 @@
         }
 
-        static bool isNonParameterAttribute( Attribute * attr ) {
-                static const std::vector<std::string> bad_names = {
-                        "aligned", "__aligned__",
-                };
-                for ( auto name : bad_names ) {
-                        if ( name == attr->name ) {
-                                return true;
-                        }
-                }
-                return false;
-        }
-
         Type * ReplaceTypedef::postmutate( TypeInstType * typeInst ) {
                 // instances of typedef types will come here. If it is an instance
@@ -980 +968 @@
                         ret->location = typeInst->location;
                         ret->get_qualifiers() |= typeInst->get_qualifiers();
-                        // GCC ignores certain attributes if they arrive by typedef, this mimics that.
-                        if ( inFunctionType ) {
-                                ret->attributes.remove_if( isNonParameterAttribute );
-                        }
-                        ret->attributes.splice( ret->attributes.end(), typeInst->attributes );
+                        // attributes are not carried over from typedef to function parameters/return values
+                        if ( ! inFunctionType ) {
+                                ret->attributes.splice( ret->attributes.end(), typeInst->attributes );
+                        } else {
+                                deleteAll( ret->attributes );
+                                ret->attributes.clear();
+                        }
                         // place instance parameters on the typedef'd type
                         if ( ! typeInst->parameters.empty() ) {