Changeset 223a633 for src/InitTweak

Timestamp:

Oct 15, 2020, 3:41:38 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

b9537e6

Parents:

33c3ded (diff), 0b18db7 (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) (1 diff)
• InitTweak.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.
                                 initStatements.push_back( ctor );
                                 objDecl->init = nullptr;

src/InitTweak/InitTweak.cc

@@ -1026 +1026 @@
                 if ( ftype->params.size() != 2 ) return false;
 
-                const ast::Type * t1 = getPointerBase( ftype->params.front()->get_type() );
+                const ast::Type * t1 = getPointerBase( ftype->params.front() );
                 if ( ! t1 ) return false;
-                const ast::Type * t2 = ftype->params.back()->get_type();
+                const ast::Type * t2 = ftype->params.back();
 
                 return ResolvExpr::typesCompatibleIgnoreQualifiers( t1, t2, ast::SymbolTable{} );