Changeset 139775e for src/InitTweak

Timestamp:

Nov 6, 2020, 4:48:52 PM (5 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, stuck-waitfor-destruct

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

Location:

src/InitTweak

Files:

• FixGlobalInit.cc (modified) (4 diffs)
• FixGlobalInit.h (modified) (1 diff)
• FixInit.h (modified) (2 diffs)
• FixInitNew.cpp (modified) (6 diffs)
• InitTweak.cc (modified) (1 diff)
• InitTweak.h (modified) (1 diff)

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;

src/InitTweak/FixGlobalInit.h

@@ -29 +29 @@
         /// function is for library code.
         void fixGlobalInit( std::list< Declaration * > & translationUnit, bool inLibrary );
-        void fixGlobalInit( std::list< ast::ptr<ast::Decl> > & translationUnit, bool inLibrary );
+        void fixGlobalInit( ast::TranslationUnit & translationUnit, bool inLibrary );
 } // namespace
 

src/InitTweak/FixInit.h

@@ -19 +19 @@
 #include <string>  // for string
 
-#include <AST/Fwd.hpp>
-
 class Declaration;
+namespace ast {
+        class TranslationUnit;
+}
 
 namespace InitTweak {
@@ -27 +28 @@
         void fix( std::list< Declaration * > & translationUnit, bool inLibrary );
 
-        void fix( std::list<ast::ptr<ast::Decl>> & translationUnit, bool inLibrary);
+        void fix( ast::TranslationUnit & translationUnit, bool inLibrary);
 } // namespace
 

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

src/InitTweak/InitTweak.cc

@@ -1113 +1113 @@
         }
 
+        void addDataSectionAttribute( ast::ObjectDecl * objDecl ) {
+                auto strLitT = new ast::PointerType(new ast::BasicType(ast::BasicType::Char));
+                objDecl->attributes.push_back(new ast::Attribute("section", {new ast::ConstantExpr(objDecl->location, strLitT, "\".data#\"", std::nullopt)}));
+        }
+
 }

src/InitTweak/InitTweak.h

@@ -119 +119 @@
         void addDataSectonAttribute( ObjectDecl * objDecl );
 
+        void addDataSectionAttribute( ast::ObjectDecl * objDecl );
+
         class InitExpander_old {
         public: