Changeset ea23d10 for src/InitTweak

Timestamp:

Feb 8, 2017, 2:35:08 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

e994912, f923b5f

Parents:

424931d (diff), 4fbdd1e3 (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

File:

• src/InitTweak/FixInit.cc (modified) (9 diffs)

src/InitTweak/FixInit.cc

@@ -104 +104 @@
                         virtual void visit( CompoundStmt *compoundStmt ) override;
                         virtual void visit( DeclStmt *stmt ) override;
+
+                        // don't go into other functions
+                        virtual void visit( FunctionDecl *decl ) override {}
+
                   protected:
                         ObjectSet curVars;
@@ -166 +170 @@
                         typedef std::list< OrderedDecls > OrderedDeclsStack;
 
-                        InsertDtors( LabelFinder & finder ) : labelVars( finder.vars ) {}
+                        InsertDtors( LabelFinder & finder ) : finder( finder ), labelVars( finder.vars ) {}
 
                         using Parent::visit;
 
                         virtual void visit( ObjectDecl * objDecl ) override;
+                        virtual void visit( FunctionDecl * funcDecl ) override;
 
                         virtual void visit( CompoundStmt * compoundStmt ) override;
@@ -178 +183 @@
                         void handleGoto( BranchStmt * stmt );
 
+                        LabelFinder & finder;
                         LabelFinder::LabelMap & labelVars;
                         OrderedDeclsStack reverseDeclOrder;
@@ -318 +324 @@
                         LabelFinder finder;
                         InsertDtors inserter( finder );
-                        acceptAll( translationUnit, finder );
                         acceptAll( translationUnit, inserter );
                 }
@@ -778 +783 @@
                 }
 
-                void ObjDeclCollector::visit( CompoundStmt *compoundStmt ) {
+                void ObjDeclCollector::visit( CompoundStmt * compoundStmt ) {
                         std::set< ObjectDecl * > prevVars = curVars;
                         Parent::visit( compoundStmt );
@@ -784 +789 @@
                 }
 
-                void ObjDeclCollector::visit( DeclStmt *stmt ) {
+                void ObjDeclCollector::visit( DeclStmt * stmt ) {
                         // keep track of all variables currently in scope
                         if ( ObjectDecl * objDecl = dynamic_cast< ObjectDecl * > ( stmt->get_decl() ) ) {
@@ -828 +833 @@
                         } // if
                         Parent::visit( objDecl );
+                }
+
+                template< typename Visitor >
+                void handleFuncDecl( FunctionDecl * funcDecl, Visitor & visitor ) {
+                        maybeAccept( funcDecl->get_functionType(), visitor );
+                        acceptAll( funcDecl->get_oldDecls(), visitor );
+                        maybeAccept( funcDecl->get_statements(), visitor );
+                }
+
+                void InsertDtors::visit( FunctionDecl * funcDecl ) {
+                        // each function needs to have its own set of labels
+                        ValueGuard< LabelFinder::LabelMap > oldLabels( labelVars );
+                        labelVars.clear();
+                        handleFuncDecl( funcDecl, finder );
+
+                        // all labels for this function have been collected, insert destructors as appropriate.
+                        // can't be Parent::mutate, because ObjDeclCollector bottoms out on FunctionDecl
+                        handleFuncDecl( funcDecl, *this );
                 }
 
@@ -952 +975 @@
                         std::set_difference( usedUninit.begin(), usedUninit.end(), unhandled.begin(), unhandled.end(), std::inserter( diff, diff.begin() ) );
                         for ( DeclarationWithType * member : diff ) {
-                                emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", field ", member->get_name(), " used before being constructed" );
+                                emit( "in ", CodeGen::genPrettyType( function->get_functionType(), function->get_name() ), ", field ", member->get_name(), " used before being constructed" );
                         }
 
@@ -997 +1020 @@
                                                         }
                                                 } catch ( SemanticError & error ) {
-                                                        emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", field ", field->get_name(), " not explicitly ", isCtor ? "constructed" : "destructed",  " and no ", isCtor ? "default constructor" : "destructor", " found" );
+                                                        emit( "in ", CodeGen::genPrettyType( function->get_functionType(), function->get_name() ), ", field ", field->get_name(), " not explicitly ", isCtor ? "constructed" : "destructed",  " and no ", isCtor ? "default constructor" : "destructor", " found" );
                                                 }
                                         }