Changeset 0a86a30

Timestamp:

Jan 27, 2017, 3:07:53 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8804701, a362f97

Parents:

0157ca7

Message:

fix dropping attributes in function pointer decay and function typedefs

Location:

src/SymTab

Files:

• FixFunction.cc (modified) (1 diff)
• Validate.cc (modified) (1 diff)

src/SymTab/FixFunction.cc

@@ -25 +25 @@
 
         DeclarationWithType * FixFunction::mutate(FunctionDecl *functionDecl) {
-                ObjectDecl *pointer = new ObjectDecl( functionDecl->get_name(), functionDecl->get_storageClass(), functionDecl->get_linkage(), 0, new PointerType( Type::Qualifiers(), functionDecl->get_type()->clone() ), 0 );
+                ObjectDecl *pointer = new ObjectDecl( functionDecl->get_name(), functionDecl->get_storageClass(), functionDecl->get_linkage(), 0, new PointerType( Type::Qualifiers(), functionDecl->get_type()->clone() ), 0, functionDecl->get_attributes() );
+                functionDecl->get_attributes().clear();
                 delete functionDecl;
                 return pointer;

src/SymTab/Validate.cc

@@ -637 +637 @@
                 if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) {
                         // replace the current object declaration with a function declaration
-                        return new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, ret->get_isInline(), ret->get_isNoreturn() );
+                        FunctionDecl * newDecl = new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, ret->get_isInline(), ret->get_isNoreturn(), objDecl->get_attributes() );
+                        objDecl->get_attributes().clear();
+                        delete objDecl;
+                        return newDecl;
                 } else if ( objDecl->get_isInline() || objDecl->get_isNoreturn() ) {
                         throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", objDecl );