Changes in src/InitTweak/FixInitNew.cpp [6a036eb:7d651a66]

File:

• src/InitTweak/FixInitNew.cpp (modified) (6 diffs)

src/InitTweak/FixInitNew.cpp

@@ -179 +179 @@
         /// expand each object declaration to use its constructor after it is declared.
         struct FixInit : public ast::WithStmtsToAdd<> {
-                static void fixInitializers( std::list< ast::ptr<ast::Decl> > &translationUnit );
+                static void fixInitializers( ast::TranslationUnit &translationUnit );
 
                 const ast::DeclWithType * postvisit( const ast::ObjectDecl *objDecl );
@@ -225 +225 @@
 } // namespace
 
-void fix( std::list< ast::ptr<ast::Decl> > & translationUnit, bool inLibrary ) {
+void fix( ast::TranslationUnit & translationUnit, bool inLibrary ) {
         ast::Pass<SelfAssignChecker>::run( translationUnit );
 
@@ -308 +308 @@
         }
 
-        void FixInit::fixInitializers( std::list< ast::ptr<ast::Decl> > & translationUnit ) {
+        void FixInit::fixInitializers( ast::TranslationUnit & translationUnit ) {
                 ast::Pass<FixInit> fixer;
 
@@ -314 +314 @@
                 // can't use DeclMutator, because sometimes need to insert IfStmt, etc.
                 SemanticErrorException errors;
-                for ( auto i = translationUnit.begin(); i != translationUnit.end(); ++i ) {
+                for ( auto i = translationUnit.decls.begin(); i != translationUnit.decls.end(); ++i ) {
                         try {
                                 // maybeAccept( *i, fixer ); translationUnit should never contain null
                                 *i = (*i)->accept(fixer);
-                                translationUnit.splice( i, fixer.core.staticDtorDecls );
+                                translationUnit.decls.splice( i, fixer.core.staticDtorDecls );
                         } catch( SemanticErrorException &e ) {
                                 errors.append( e );
@@ -864 +864 @@
                         if ( const ast::Stmt * ctor = ctorInit->ctor ) {
                                 if ( objDecl->storage.is_static ) {
+                                        addDataSectionAttribute(objDecl);
                                         // originally wanted to take advantage of gcc nested functions, but
                                         // we get memory errors with this approach. To remedy this, the static
@@ -947 +948 @@
                                                 objDecl->name = objDecl->name + staticNamer.newName();
                                                 objDecl->mangleName = Mangle::mangle( objDecl );
+                                                objDecl->init = nullptr;
 
                                                 // xxx - temporary hack: need to return a declaration, but want to hoist the current object out of this scope