Changeset 7baed7d for src/InitTweak

Timestamp:

Jun 6, 2016, 5:46:09 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

64a32c6

Parents:

64071c2

Message:

generalize notion of a GCC attribute

File:

• src/InitTweak/FixGlobalInit.cc (modified) (2 diffs)

src/InitTweak/FixGlobalInit.cc

@@ -22 +22 @@
 #include "SynTree/Initializer.h"
 #include "SynTree/Visitor.h"
+#include "SynTree/Attribute.h"
 #include <algorithm>
 
@@ -116 +117 @@
         GlobalFixer::GlobalFixer( const std::string & name, bool inLibrary ) : tempNamer( "_global_init" ) {
                 std::string fixedName = globalFunctionName( name );
-                initFunction = new FunctionDecl( "_init_" + fixedName, DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false, FunctionDecl::Attribute( FunctionDecl::Attribute::Constructor, inLibrary ? FunctionDecl::Attribute::High : FunctionDecl::Attribute::Default ) );
-
-                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false, FunctionDecl::Attribute( FunctionDecl::Attribute::Destructor, inLibrary ? FunctionDecl::Attribute::High : FunctionDecl::Attribute::Default ) );
+                std::list< Expression * > ctorParameters;
+                std::list< Expression * > dtorParameters;
+                if ( inLibrary ) {
+                        // Constructor/destructor attributes take a single parameter which
+                        // is the priority, with lower numbers meaning higher priority.
+                        // Functions specified with priority are guaranteed to run before
+                        // functions without a priority. To ensure that constructors and destructors
+                        // for library code are run before constructors and destructors for user code,
+                        // specify a priority when building the library. Priorities 0-100 are reserved by gcc.
+                        ctorParameters.push_back( new ConstantExpr( Constant::from_int( 101 ) ) );
+                        dtorParameters.push_back( new ConstantExpr( Constant::from_int( 101 ) ) );
+                }
+                initFunction = new FunctionDecl( "_init_" + fixedName, DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
+                initFunction->get_attributes().push_back( new Attribute( "constructor", ctorParameters ) );
+                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
+                destroyFunction->get_attributes().push_back( new Attribute( "destructor", dtorParameters ) );
         }