Changeset 6250a312 for src/GenPoly

Timestamp:

May 10, 2017, 5:00:47 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, stuck-waitfor-destruct, with_gc

Children:

8514fe19, dbfb35d

Parents:

0f9bef3 (diff), 29cf9c8 (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.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/GenPoly

Files:

• InstantiateGeneric.cc (modified) (3 diffs)
• PolyMutator.cc (modified) (2 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -233 +233 @@
                                 } else {
                                         // normalize possibly dtype-static parameter type
-                                        out.push_back( new TypeExpr{ 
+                                        out.push_back( new TypeExpr{
                                                 ScrubTyVars::scrubAll( paramType->get_type()->clone() ) } );
                                         gt |= genericType::concrete;
@@ -369 +369 @@
                                 DeclMutator::addDeclaration( concDecl );
                                 insert( inst, typeSubs, concDecl );
+                                concDecl->acceptMutator( *this ); // recursively instantiate members
                         }
                         StructInstType *newInst = new StructInstType( inst->get_qualifiers(), concDecl->get_name() );
@@ -423 +424 @@
                                 DeclMutator::addDeclaration( concDecl );
                                 insert( inst, typeSubs, concDecl );
+                                concDecl->acceptMutator( *this ); // recursively instantiate members
                         }
                         UnionInstType *newInst = new UnionInstType( inst->get_qualifiers(), concDecl->get_name() );

src/GenPoly/PolyMutator.cc

@@ -50 +50 @@
 
         Statement * PolyMutator::mutateStatement( Statement *stmt ) {
+                // don't want statements from outer CompoundStmts to be added to this CompoundStmt
+                ValueGuard< std::list< Statement* > > oldStmtsToAdd( stmtsToAdd );
+                ValueGuard< std::list< Statement* > > oldStmtsToAddAfter( stmtsToAddAfter );
+                ValueGuard< TypeSubstitution * > oldEnv( env );
+                stmtsToAdd.clear();
+                stmtsToAddAfter.clear();
+
                 Statement *newStmt = maybeMutate( stmt, *this );
                 if ( ! stmtsToAdd.empty() || ! stmtsToAddAfter.empty() ) {
@@ -83 +90 @@
 
         Statement * PolyMutator::mutate(IfStmt *ifStmt) {
+                ifStmt->set_condition(  mutateExpression( ifStmt->get_condition() ) );
                 ifStmt->set_thenPart(  mutateStatement( ifStmt->get_thenPart() ) );
                 ifStmt->set_elsePart(  mutateStatement( ifStmt->get_elsePart() ) );
-                ifStmt->set_condition(  mutateExpression( ifStmt->get_condition() ) );
                 return ifStmt;
         }
 
         Statement * PolyMutator::mutate(WhileStmt *whileStmt) {
+                whileStmt->set_condition(  mutateExpression( whileStmt->get_condition() ) );
                 whileStmt->set_body(  mutateStatement( whileStmt->get_body() ) );
-                whileStmt->set_condition(  mutateExpression( whileStmt->get_condition() ) );
                 return whileStmt;
         }
 
         Statement * PolyMutator::mutate(ForStmt *forStmt) {
-                forStmt->set_body(  mutateStatement( forStmt->get_body() ) );
                 mutateAll( forStmt->get_initialization(), *this );
                 forStmt->set_condition(  mutateExpression( forStmt->get_condition() ) );
                 forStmt->set_increment(  mutateExpression( forStmt->get_increment() ) );
+                forStmt->set_body(  mutateStatement( forStmt->get_body() ) );
                 return forStmt;
         }
 
         Statement * PolyMutator::mutate(SwitchStmt *switchStmt) {
+                switchStmt->set_condition( mutateExpression( switchStmt->get_condition() ) );
                 mutateStatementList( switchStmt->get_statements() );
-                switchStmt->set_condition( mutateExpression( switchStmt->get_condition() ) );
                 return switchStmt;
         }
 
         Statement * PolyMutator::mutate(CaseStmt *caseStmt) {
+                caseStmt->set_condition(  mutateExpression( caseStmt->get_condition() ) );
                 mutateStatementList( caseStmt->get_statements() );
-                caseStmt->set_condition(  mutateExpression( caseStmt->get_condition() ) );
                 return caseStmt;
         }