Changes in src/SymTab/Validate.cc [954c954:98538288]

File:

• src/SymTab/Validate.cc (modified) (6 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() ) {
@@ -1384 +1374 @@
         /// Replaces enum types by int, and function/array types in function parameter and return
         /// lists by appropriate pointers
-        /*
         struct EnumAndPointerDecay_new {
                 const ast::EnumDecl * previsit( const ast::EnumDecl * enumDecl ) {
@@ -1435 +1424 @@
                 }
         };
-        */
 
         /// expand assertions from a trait instance, performing appropriate type variable substitutions
@@ -1520 +1508 @@
                 }
 
-                void checkGenericParameters( const ast::BaseInstType * inst ) {
+                void checkGenericParameters( const ast::ReferenceToType * inst ) {
                         for ( const ast::Expr * param : inst->params ) {
                                 if ( ! dynamic_cast< const ast::TypeExpr * >( param ) ) {
@@ -1839 +1827 @@
 const ast::Type * validateType(
                 const CodeLocation & loc, const ast::Type * type, const ast::SymbolTable & symtab ) {
-        // ast::Pass< EnumAndPointerDecay_new > epc;
+        ast::Pass< EnumAndPointerDecay_new > epc;
         ast::Pass< LinkReferenceToTypes_new > lrt{ loc, symtab };
         ast::Pass< ForallPointerDecay_new > fpd{ loc };
 
-        return type->accept( lrt )->accept( fpd );
+        return type->accept( epc )->accept( lrt )->accept( fpd );
 }