Changeset 83de11e

Timestamp:

Jun 1, 2016, 5:58:15 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

4df85197

Parents:

677c1be

Message:

fix invalid use of lists that caused a crash in gcc versions larger than 4.9.3C

Location:

src

Files:

• GenPoly/GenPoly.cc (modified) (7 diffs)
• SymTab/Validate.cc (modified) (2 diffs)

src/GenPoly/GenPoly.cc

@@ -64 +64 @@
                         return false;
                 }
-                
+
                 /// Replaces a TypeInstType by its referrent in the environment, if applicable
                 Type* replaceTypeInst( Type* type, const TypeSubstitution* env ) {
@@ -78 +78 @@
         Type *isPolyType( Type *type, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
-                
+
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
                         return type;
@@ -91 +91 @@
         Type *isPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
-                
+
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
                         if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
@@ -106 +106 @@
         Type *isPolyPtr( Type *type, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
-                
+
                 if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
                         return isPolyType( ptr->get_base(), env );
@@ -115 +115 @@
         Type *isPolyPtr( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
-                
+
                 if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
                         return isPolyType( ptr->get_base(), tyVars, env );
@@ -129 +129 @@
                 while ( true ) {
                         type = replaceTypeInst( type, env );
-                
+
                         if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
                                 type = ptr->get_base();
@@ -146 +146 @@
                 while ( true ) {
                         type = replaceTypeInst( type, env );
-                
+
                         if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
                                 type = ptr->get_base();

src/SymTab/Validate.cc

@@ -291 +291 @@
 
         namespace {
-                template< typename DWTIterator >
-                void fixFunctionList( DWTIterator begin, DWTIterator end, FunctionType *func ) {
+                template< typename DWTList >
+                void fixFunctionList( DWTList & dwts, FunctionType * func ) {
                         // the only case in which "void" is valid is where it is the only one in the list; then it should be removed
                         // entirely other fix ups are handled by the FixFunction class
+                        typedef typename DWTList::iterator DWTIterator;
+                        DWTIterator begin( dwts.begin() ), end( dwts.end() );
                         if ( begin == end ) return;
                         FixFunction fixer;
                         DWTIterator i = begin;
-                        *i = (*i )->acceptMutator( fixer );
+                        *i = (*i)->acceptMutator( fixer );
                         if ( fixer.get_isVoid() ) {
                                 DWTIterator j = i;
                                 ++i;
-                                func->get_parameters().erase( j );
+                                dwts.erase( j );
                                 if ( i != end ) {
                                         throw SemanticError( "invalid type void in function type ", func );
@@ -321 +323 @@
         void Pass1::visit( FunctionType *func ) {
                 // Fix up parameters and return types
-                fixFunctionList( func->get_parameters().begin(), func->get_parameters().end(), func );
-                fixFunctionList( func->get_returnVals().begin(), func->get_returnVals().end(), func );
+                fixFunctionList( func->get_parameters(), func );
+                fixFunctionList( func->get_returnVals(), func );
                 Visitor::visit( func );
         }