Changeset 7d651a6

Timestamp:

Nov 5, 2020, 7:25:03 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

3febb2d

Parents:

a3f5208a

Message:

fix static init crash

Location:

src/InitTweak

Files:

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

src/InitTweak/FixGlobalInit.cc

@@ -183 +183 @@
                         } // if
                         if ( const ast::Stmt * ctor = ctorInit->ctor ) {
+                                addDataSectionAttribute(mutDecl);
                                 initStmts.push_back( ctor );
                                 mutDecl->init = nullptr;

src/InitTweak/FixInitNew.cpp

@@ -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: