Changeset 936a287 for src/InitTweak/FixInit.cc

Timestamp:

Mar 30, 2017, 5:21:14 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

077810d, 72dc82a

Parents:

fbcde64 (diff), a4dd728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

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

src/InitTweak/FixInit.cc

@@ -738 +738 @@
                                                 stmtsToAddAfter.push_back( ifStmt );
 
-                                                if ( ctorInit->get_dtor() ) {
+                                                Statement * dtor = ctorInit->get_dtor();
+                                                objDecl->set_init( NULL );
+                                                ctorInit->set_ctor( NULL );
+                                                ctorInit->set_dtor( nullptr );
+                                                if ( dtor ) {
                                                         // if the object has a non-trivial destructor, have to
                                                         // hoist it and the object into the global space and
                                                         // call the destructor function with atexit.
 
-                                                        Statement * dtorStmt = ctorInit->get_dtor()->clone();
+                                                        Statement * dtorStmt = dtor->clone();
 
                                                         // void __objName_dtor_atexitN(...) {...}
@@ -772 +776 @@
                                                         objDecl->set_mangleName( SymTab::Mangler::mangle( objDecl ) );
 
-                                                        objDecl->set_init( NULL );
-                                                        ctorInit->set_ctor( NULL );
-                                                        delete ctorInit;
-
                                                         // xxx - temporary hack: need to return a declaration, but want to hoist the current object out of this scope
                                                         // create a new object which is never used
                                                         static UniqueName dummyNamer( "_dummy" );
                                                         ObjectDecl * dummy = new ObjectDecl( dummyNamer.newName(), Type::StorageClasses( Type::Static ), LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), 0, std::list< Attribute * >{ new Attribute("unused") } );
+                                                        delete ctorInit;
                                                         return dummy;
                                                 }