Changes in src/SymTab/Validate.cc [b95fe40:1f370451]

File:

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

src/SymTab/Validate.cc

@@ -201 +201 @@
                 Declaration * postmutate( TraitDecl * contextDecl );
 
+                void premutate( FunctionType * ftype );
+
           private:
                 template<typename AggDecl>
@@ -214 +216 @@
                 TypeDeclMap typedeclNames;
                 int scopeLevel;
+                bool inFunctionType = false;
         };
 
@@ -725 +728 @@
                         Type *ret = def->second.first->base->clone();
                         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();
+                        }
                         // place instance parameters on the typedef'd type
                         if ( ! typeInst->parameters.empty() ) {
@@ -901 +911 @@
         Declaration *EliminateTypedef::postmutate( TraitDecl * traitDecl ) {
                 return handleAggregate( traitDecl );
+        }
+
+        void EliminateTypedef::premutate( FunctionType * ) {
+                GuardValue( inFunctionType );
+                inFunctionType = true;
         }