Changeset d107010 for src/SymTab/Validate.cc
- Timestamp:
- Mar 4, 2017, 10:31:03 PM (9 years ago)
- 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:
- 3f80888
- Parents:
- c3ebf37 (diff), 8191203 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/SymTab/Validate.cc
rc3ebf37 rd107010 10 10 // Created On : Sun May 17 21:50:04 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Feb 2 17:47:54201713 // Update Count : 3 1212 // Last Modified On : Fri Mar 3 21:02:23 2017 13 // Update Count : 332 14 14 // 15 15 … … 629 629 } else { 630 630 TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() ); 631 assertf( base != typedeclNames.end(), "Can't find name %s", typeInst->get_name().c_str() );631 assertf( base != typedeclNames.end(), "Can't find typedecl name %s", typeInst->get_name().c_str() ); 632 632 typeInst->set_baseType( base->second ); 633 633 } // if … … 691 691 DeclarationWithType *ret = Mutator::mutate( objDecl ); 692 692 typedefNames.endScope(); 693 // is the type a function? 694 if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) { 693 694 if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) { // function type? 695 695 // replace the current object declaration with a function declaration 696 FunctionDecl * newDecl = new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, ret->get_isInline(), ret->get_isNoreturn(), objDecl->get_attributes() );696 FunctionDecl * newDecl = new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, objDecl->get_attributes(), ret->get_funcSpec() ); 697 697 objDecl->get_attributes().clear(); 698 698 objDecl->set_type( nullptr ); 699 699 delete objDecl; 700 700 return newDecl; 701 } else if ( objDecl->get_isInline() || objDecl->get_isNoreturn() ) {702 throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", objDecl );703 701 } // if 704 702 return ret; … … 732 730 } 733 731 734 // there may be typedefs nested within aggregates in order for everything to work properly, these should be removed732 // there may be typedefs nested within aggregates. in order for everything to work properly, these should be removed 735 733 // as well 736 734 template<typename AggDecl>
Note:
See TracChangeset
for help on using the changeset viewer.