Changeset 1db21619 for src/SymTab/Validate.cc

Timestamp:

Jul 16, 2015, 5:28:24 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

994ec2c

Parents:

724c2b6

Message:

add CFA flag, remove -p from cc1, typedef on functions become function declarations, move isInline/isNoreturn to Declaration, cleaned up label code

File:

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

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 14 12:27:54 2015
-// Update Count     : 186
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 16 16:10:02 2015
+// Update Count     : 189
 //
 
@@ -162 +162 @@
         class EliminateTypedef : public Mutator {
           public:
-          EliminateTypedef() : scopeLevel( 0 ) {}
+                EliminateTypedef() : scopeLevel( 0 ) {}
                 static void eliminateTypedef( std::list< Declaration * > &translationUnit );
           private:
@@ -168 +168 @@
                 virtual TypeDecl *mutate( TypeDecl *typeDecl );
                 virtual DeclarationWithType *mutate( FunctionDecl *funcDecl );
-                virtual ObjectDecl *mutate( ObjectDecl *objDecl );
+                virtual DeclarationWithType *mutate( ObjectDecl *objDecl );
                 virtual CompoundStmt *mutate( CompoundStmt *compoundStmt );
                 virtual Type *mutate( TypeInstType *aggregateUseType );
@@ -612 +612 @@
 
                 // need to remove the prototypes, since this may be nested in a routine
-                for (int start = 0, end = assigns.size()/2; start < end; start++) {
+                for ( int start = 0, end = assigns.size() / 2; start < end; start++ ) {
                         delete assigns.front();
                         assigns.pop_front();
-                }
+                } // for
 
                 declsToAdd.insert( declsToAdd.begin(), assigns.begin(), assigns.end() );
@@ -830 +830 @@
                                 rtt->get_parameters().clear();
                                 cloneAll(typeInst->get_parameters(), rtt->get_parameters());
-                        }
+                        } // if
                         delete typeInst;
                         return ret;
@@ -884 +884 @@
         }
 
-        ObjectDecl *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
+        DeclarationWithType *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
                 TypedefMap oldNames = typedefNames;
-                ObjectDecl *ret = Mutator::mutate( objDecl );
+                DeclarationWithType *ret = Mutator::mutate( objDecl );
+                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) {
+                        return new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, ret->get_isInline(), ret->get_isNoreturn() );
+                } else if ( objDecl->get_isInline() || objDecl->get_isNoreturn() ) {
+                        throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", objDecl );
+                } // if
                 typedefNames = oldNames;
                 return ret;
@@ -950 +955 @@
         }
 
-                Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
+        Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
                 Mutator::mutate( contextDecl );
                 return handleAggregate( contextDecl );