Changeset f1791a4 for src/InitTweak/FixGlobalInit.cc

Timestamp:

Oct 15, 2020, 9:41:31 PM (3 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

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

Children:

afe2939

Parents:

0b18db7

Message:

Expanding earlier #182 fix to another case of the same issue. Fixes #224?

There is now a reusable helper function addDataSectonAttribute that applies the fix to an ObjectDecl? when we realize it needs it. Test const-init is expanded with case of #224.

File:

• src/InitTweak/FixGlobalInit.cc (modified) (1 diff)

src/InitTweak/FixGlobalInit.cc

@@ -112 +112 @@
                         } // if
                         if ( Statement * ctor = ctorInit->ctor ) {
-                                // Translation 1: Add this attribute on the global declaration:
-                                //    __attribute__((section (".data#")))
-                                // which makes gcc put the global in the data section,
-                                // so that the global is writeable (via a const cast) in the init function.
-                                // The trailing # is an injected assembly comment, to suppress the "a" in
-                                //    .section .data,"a"
-                                //    .section .data#,"a"
-                                // to avoid assembler warning "ignoring changed section attributes for .data"
-                                Type *strLitT = new PointerType( Type::Qualifiers( ),
-                                        new BasicType( Type::Qualifiers( ), BasicType::Char ) );
-                                std::list< Expression * > attr_params;
-                                attr_params.push_back( 
-                                        new ConstantExpr( Constant( strLitT, "\".data#\"", std::nullopt ) ) );
-                                objDecl->attributes.push_back(new Attribute("section", attr_params));
-                                // Translation 2: Move the initizliation off the global declaration,
-                                // into the startup function.
+                                addDataSectonAttribute( objDecl );
                                 initStatements.push_back( ctor );
                                 objDecl->init = nullptr;