Changeset f1b1e4c for src/InitTweak/FixGlobalInit.cc

Timestamp:

Jun 1, 2016, 11:54:23 AM (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:

be945ac

Parents:

70f89d00

Message:

can construct global const objects, except with intrinsic constructors

File:

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

src/InitTweak/FixGlobalInit.cc

@@ -125 +125 @@
                 std::list< Statement * > & destroyStatements = destroyFunction->get_statements()->get_kids();
 
-                // 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
@@ -146 +144 @@
                         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 ) );
+                        initStatements.push_back( new ImplicitCtorDtorStmt( 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 ) );
+                        destroyStatements.push_front( new ImplicitCtorDtorStmt( new ExprStmt( noLabels, destroy ) ) );
                 }
         }