Changes in src/InitTweak/FixGlobalInit.cc [7b3f66b:03e5d14]

File:

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

src/InitTweak/FixGlobalInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 04 15:14:56 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 13 11:37:30 2016
+// Last Modified On : Fri May 06 15:40:48 2016
 // Update Count     : 2
 //
 
 #include "FixGlobalInit.h"
-#include "InitTweak.h"
 #include "SynTree/Declaration.h"
 #include "SynTree/Type.h"
@@ -43 +42 @@
                 UniqueName tempNamer;
                 FunctionDecl * initFunction;
-                FunctionDecl * destroyFunction;
         };
 
@@ -92 +90 @@
                 GlobalFixer fixer( name, inLibrary );
                 acceptAll( translationUnit, fixer );
-                // don't need to include function if it's empty
-                if ( fixer.initFunction->get_statements()->get_kids().empty() ) {
-                        delete fixer.initFunction;
-                } else {
-                        translationUnit.push_back( fixer.initFunction );
-                }
-                if ( fixer.destroyFunction->get_statements()->get_kids().empty() ) {
-                        delete fixer.destroyFunction;
-                } else {
-                        translationUnit.push_back( fixer.destroyFunction );
-                }
+                translationUnit.push_back( fixer.initFunction );
         }
 
-  std::string globalFunctionName( const std::string & name ) {
+  std::string initName( const std::string & name ) {
         // get basename
         std::string ret = name.substr( 0, name.find( '.' ) );
@@ -111 +99 @@
                 static std::string invalid = "/-";
         replace_if( ret.begin(), ret.end(), []( char c ) { return invalid.find(c) != std::string::npos; }, '_' );
-        return ret;
+        return "_init_" + ret;
   }
 
         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 ) );
+                initFunction = new FunctionDecl( initName( name ), 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 ) );
         }
 
         void GlobalFixer::visit( ObjectDecl *objDecl ) {
-                std::list< Statement * > & initStatements = initFunction->get_statements()->get_kids();
-                std::list< Statement * > & destroyStatements = destroyFunction->get_statements()->get_kids();
+                std::list< Statement * > & statements = initFunction->get_statements()->get_kids();
 
-                // if ( objDecl->get_init() == NULL ) return;
-                if ( ! tryConstruct( objDecl ) ) return; // don't construct @= or designated objects
+                if ( objDecl->get_init() == NULL ) return;
                 if ( objDecl->get_type()->get_isConst() ) return; // temporary: can't assign to a const variable
-                if ( objDecl->get_storageClass() == DeclarationNode::Extern ) return;
                 // C allows you to initialize objects with constant expressions
                 // xxx - this is an optimization. Need to first resolve constructors before we decide
@@ -134 +116 @@
                 // if ( isConstExpr( objDecl->get_init() ) ) return;
 
-                if ( ArrayType * at = dynamic_cast< ArrayType * > ( objDecl->get_type() ) ) {
-                        // xxx - initialize each element of the array
-                } else {
-                        // steal initializer from object and attach it to a new temporary
-                        ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, objDecl->get_type()->clone(), objDecl->get_init() );
-                        objDecl->set_init( NULL );
-                        initStatements.push_back( new DeclStmt( noLabels, newObj ) );
+                // steal initializer from object and attach it to a new temporary
+                ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, objDecl->get_type()->clone(), objDecl->get_init() );
+                objDecl->set_init( NULL );
+                statements.push_back( new DeclStmt( noLabels, newObj ) );
 
-                        // copy construct objDecl using temporary
-                        UntypedExpr * init = new UntypedExpr( new NameExpr( "?{}" ) );
-                        init->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
-                        init->get_args().push_back( new VariableExpr( newObj ) );
-                        initStatements.push_back( new ExprStmt( noLabels, init ) );
+                // assign (later: copy construct) objDecl using temporary
+                UntypedExpr * init = new UntypedExpr( new NameExpr( "?=?" ) );
+                init->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
+                init->get_args().push_back( new VariableExpr( newObj ) );
+                statements.push_back( new ExprStmt( noLabels, init ) );
 
-                        // add destructor calls to global destroy function
-                        UntypedExpr * destroy = new UntypedExpr( new NameExpr( "^?{}" ) );
-                        destroy->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
-                        destroyStatements.push_front( new ExprStmt( noLabels, destroy ) );
-                }
+                // xxx- need to destruct objDecl atexit
         }