Changeset 7b3f66b for src/InitTweak/FixGlobalInit.cc

Timestamp:

May 13, 2016, 1:18:35 PM (8 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:

d668182

Parents:

fb24492

Message:

Don't construct global extern variables, handle global array construction separately, stub for array initialization list with constructors

File:

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

src/InitTweak/FixGlobalInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 04 15:14:56 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon May 09 11:44:29 2016
+// Last Modified On : Fri May 13 11:37:30 2016
 // Update Count     : 2
 //
 
 #include "FixGlobalInit.h"
-#include "GenInit.h"
+#include "InitTweak.h"
 #include "SynTree/Declaration.h"
 #include "SynTree/Type.h"
@@ -125 +125 @@
                 std::list< Statement * > & destroyStatements = destroyFunction->get_statements()->get_kids();
 
-                if ( objDecl->get_init() == NULL ) return;
+                // if ( objDecl->get_init() == NULL ) return;
                 if ( ! tryConstruct( objDecl ) ) return; // don't construct @= or designated objects
                 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
@@ -133 +134 @@
                 // if ( isConstExpr( objDecl->get_init() ) ) return;
 
-                // 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 ) );
+                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 ) );
 
-                // 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 ) );
+                        // 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 ) );
 
-                // 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 ) );
+                        // 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 ) );
+                }
         }