Changeset 1be845b

Timestamp:

Jul 30, 2018, 4:43:47 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

f072892

Parents:

c198b69

git-author:

Rob Schluntz <rschlunt@…> (07/26/18 13:54:40)

git-committer:

Rob Schluntz <rschlunt@…> (07/30/18 16:43:47)

Message:

Remove filename from global init/destroy functions, use fixed constructor/destructor priority of 200 for CFA library globals

Location:

src

Files:

• InitTweak/FixGlobalInit.cc (modified) (4 diffs)
• InitTweak/FixGlobalInit.h (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (1 diff)
• InitTweak/FixInit.h (modified) (1 diff)
• main.cc (modified) (1 diff)

src/InitTweak/FixGlobalInit.cc

@@ -37 +37 @@
         class GlobalFixer : public WithShortCircuiting {
           public:
-                GlobalFixer( const std::string & name, bool inLibrary );
+                GlobalFixer( bool inLibrary );
 
                 void previsit( ObjectDecl *objDecl );
@@ -52 +52 @@
         };
 
-        void fixGlobalInit( std::list< Declaration * > & translationUnit, const std::string & name, bool inLibrary ) {
-                PassVisitor<GlobalFixer> visitor( name, inLibrary );
+        void fixGlobalInit( std::list< Declaration * > & translationUnit, bool inLibrary ) {
+                PassVisitor<GlobalFixer> visitor( inLibrary );
                 acceptAll( translationUnit, visitor );
                 GlobalFixer & fixer = visitor.pass;
@@ -70 +70 @@
         }
 
-  std::string globalFunctionName( const std::string & name ) {
-        // get basename
-        std::string ret = name.substr( 0, name.find( '.' ) );
-        // replace invalid characters with _
-                static std::string invalid = "/-@";
-        replace_if( ret.begin(), ret.end(), []( char c ) { return invalid.find(c) != std::string::npos; }, '_' );
-        return ret;
-  }
-
-        GlobalFixer::GlobalFixer( const std::string & name, bool inLibrary ) : tempNamer( "_global_init" ) {
-                std::string fixedName = globalFunctionName( name );
+        GlobalFixer::GlobalFixer( bool inLibrary ) : tempNamer( "_global_init" ) {
                 std::list< Expression * > ctorParameters;
                 std::list< Expression * > dtorParameters;
@@ -90 +80 @@
                         // 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( 102 ) ) );
-                        dtorParameters.push_back( new ConstantExpr( Constant::from_int( 102 ) ) );
+                        // Priorities 101-200 are reserved by cfa, so use priority 200 for CFA library globals,
+                        // allowing room for overriding with a higher priority.
+                        ctorParameters.push_back( new ConstantExpr( Constant::from_int( 200 ) ) );
+                        dtorParameters.push_back( new ConstantExpr( Constant::from_int( 200 ) ) );
                 }
-                initFunction = new FunctionDecl( "_init_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
+                initFunction = new FunctionDecl( "__global_init__", Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
                 initFunction->get_attributes().push_back( new Attribute( "constructor", ctorParameters ) );
-                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
+                destroyFunction = new FunctionDecl( "__global_destroy__", Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
                 destroyFunction->get_attributes().push_back( new Attribute( "destructor", dtorParameters ) );
         }

src/InitTweak/FixGlobalInit.h

@@ -22 +22 @@
 
 namespace InitTweak {
-  /// Moves global initialization into an _init function that is unique to the translation unit.
-  /// Sets the priority of the initialization function depending on whether the initialization
-  /// function is for library code.
-  void fixGlobalInit( std::list< Declaration * > & translationUnit, const std::string & name, bool inLibrary );
-
-  /// Apply transformations to a file name to get a valid C identifier which will be used as
-  /// the name of the generated initializer function.
-  std::string globalFunctionName( const std::string & name );
+        /// Moves global initialization into an _init function that is unique to the translation unit.
+        /// Sets the priority of the initialization function depending on whether the initialization
+        /// function is for library code.
+        void fixGlobalInit( std::list< Declaration * > & translationUnit, bool inLibrary );
 } // namespace
 

src/InitTweak/FixInit.cc

@@ -238 +238 @@
         } // namespace
 
-        void fix( std::list< Declaration * > & translationUnit, const std::string & filename, bool inLibrary ) {
+        void fix( std::list< Declaration * > & translationUnit, bool inLibrary ) {
                 PassVisitor<SelfAssignChecker> checker;
                 acceptAll( translationUnit, checker );
 
                 // fixes ConstructorInit for global variables. should happen before fixInitializers.
-                InitTweak::fixGlobalInit( translationUnit, filename, inLibrary );
+                InitTweak::fixGlobalInit( translationUnit, inLibrary );
 
                 UnqCount unqCount;

src/InitTweak/FixInit.h

@@ -24 +24 @@
   /// replace constructor initializers with expression statements
   /// and unwrap basic C-style initializers
-        void fix( std::list< Declaration * > & translationUnit, const std::string & name, bool inLibrary );
+        void fix( std::list< Declaration * > & translationUnit, bool inLibrary );
 } // namespace
 

src/main.cc

@@ -299 +299 @@
 
                 // fix ObjectDecl - replaces ConstructorInit nodes
-                PASS( "fixInit", InitTweak::fix( translationUnit, filename, libcfap || treep ) );
+                PASS( "fixInit", InitTweak::fix( translationUnit, libcfap || treep ) );
                 if ( ctorinitp ) {
                         dump ( translationUnit );