Changeset 139775e for src/InitTweak/FixGlobalInit.cc

Timestamp:

Nov 6, 2020, 4:48:52 PM (3 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

75baaa3

Parents:

55acc3a (diff), 836c9925 (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/FixGlobalInit.cc (modified) (4 diffs)

src/InitTweak/FixGlobalInit.cc

@@ -109 +109 @@
         }
 
-        void fixGlobalInit(std::list<ast::ptr<ast::Decl>> & translationUnit, bool inLibrary) {
+        void fixGlobalInit(ast::TranslationUnit & translationUnit, bool inLibrary) {
                 ast::Pass<GlobalFixer_new> fixer;
                 accept_all(translationUnit, fixer);
@@ -119 +119 @@
                                 ast::Storage::Static, ast::Linkage::C, {new ast::Attribute("constructor", std::move(ctorParams))});
 
-                        translationUnit.emplace_back( initFunction );
+                        translationUnit.decls.emplace_back( initFunction );
                 } // if
 
@@ -128 +128 @@
                                 ast::Storage::Static, ast::Linkage::C, {new ast::Attribute("destructor", std::move(dtorParams))});
 
-                        translationUnit.emplace_back(destroyFunction);
+                        translationUnit.decls.emplace_back(destroyFunction);
                 } // if
         }
@@ -183 +183 @@
                         } // if
                         if ( const ast::Stmt * ctor = ctorInit->ctor ) {
+                                addDataSectionAttribute(mutDecl);
                                 initStmts.push_back( ctor );
                                 mutDecl->init = nullptr;