Changeset 2724b4e for src/SymTab

Timestamp:

Sep 16, 2020, 1:48:17 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

673eb7a

Parents:

c402739f (diff), da9a27c (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/SymTab

Files:

• Mangler.cc (modified) (2 diffs)
• Validate.cc (modified) (3 diffs)

src/SymTab/Mangler.cc

@@ -437 +437 @@
                   private:
                         void mangleDecl( const ast::DeclWithType *declaration );
-                        void mangleRef( const ast::ReferenceToType *refType, std::string prefix );
+                        void mangleRef( const ast::BaseInstType *refType, std::string prefix );
 
                         void printQualifiers( const ast::Type *type );
@@ -560 +560 @@
                 }
 
-                void Mangler_new::mangleRef( const ast::ReferenceToType * refType, std::string prefix ) {
+                void Mangler_new::mangleRef( const ast::BaseInstType * refType, std::string prefix ) {
                         printQualifiers( refType );
 

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
@@ -968 +980 @@
                         ret->location = typeInst->location;
                         ret->get_qualifiers() |= typeInst->get_qualifiers();
-                        // 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();
-                        }
+                        // 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 );
                         // place instance parameters on the typedef'd type
                         if ( ! typeInst->parameters.empty() ) {
@@ -1508 +1518 @@
                 }
 
-                void checkGenericParameters( const ast::ReferenceToType * inst ) {
+                void checkGenericParameters( const ast::BaseInstType * inst ) {
                         for ( const ast::Expr * param : inst->params ) {
                                 if ( ! dynamic_cast< const ast::TypeExpr * >( param ) ) {