Changeset 8655363 for src/Validate

Timestamp:

Jan 11, 2024, 8:59:51 AM (8 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

7db39f7

Parents:

4d689e2 (diff), b262cb3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/Validate

Files:

• Autogen.cpp (modified) (1 diff)
• ReplaceTypedef.cpp (modified) (2 diffs)

src/Validate/Autogen.cpp

@@ -440 +440 @@
 
                 auto * paramType = ast::deepCopy( member->get_type() );
-                paramType->attributes.clear();
+                erase_if( paramType->attributes, []( ast::Attribute const * attr ){
+                        return !attr->isValidOnFuncParam();
+                } );
                 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 :
@@ -101 +89 @@
                 // by typedef. GCC appears to do the same thing.
                 if ( isAtFunctionTop ) {
-                        erase_if( ret->attributes, isNonParameterAttribute );
+                        erase_if( ret->attributes, []( ast::Attribute const * attr ){
+                                return !attr->isValidOnFuncParam();
+                        } );
                 }
                 for ( const auto & attribute : type->attributes ) {