Changeset 39f04ec for src/InitTweak

Timestamp:

Jul 5, 2016, 11:10:14 AM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

9bb81bb8

Parents:

a43e1d7 (diff), d32c4e2 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/InitTweak

Files:

• FixGlobalInit.cc (modified) (5 diffs)
• FixInit.cc (modified) (1 diff)

src/InitTweak/FixGlobalInit.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Mon May 04 15:14:56 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 13 11:37:30 2016
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jun 29 22:33:15 2016
+// Update Count     : 4
 //
 
@@ -85 +85 @@
                         init->accept( checker );
                         return checker.isConstExpr;
-                }
+                } // if
                 // for all intents and purposes, no initializer means const expr
                 return true;
@@ -98 +98 @@
                 } else {
                         translationUnit.push_back( fixer.initFunction );
-                }
+                } // if
+
                 if ( fixer.destroyFunction->get_statements()->get_kids().empty() ) {
                         delete fixer.destroyFunction;
                 } else {
                         translationUnit.push_back( fixer.destroyFunction );
-                }
+                } // if
         }
 
@@ -146 +147 @@
                 // if ( isConstExpr( objDecl->get_init() ) ) return;
 
-                if ( ArrayType * at = dynamic_cast< ArrayType * > ( objDecl->get_type() ) ) {
+                if ( dynamic_cast< ArrayType * > ( objDecl->get_type() ) ) {
                         // xxx - initialize each element of the array
                 } else {
@@ -164 +165 @@
                         destroy->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
                         destroyStatements.push_front( new ImplicitCtorDtorStmt( new ExprStmt( noLabels, destroy ) ) );
-                }
+                } // if
         }
 

src/InitTweak/FixInit.cc

@@ -449 +449 @@
                                                 FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + "_dtor_atexit", DeclarationNode::NoStorageClass, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
                                                 dtorCaller->fixUniqueId();
-                                                dtorCaller->get_statements()->get_kids().push_back( ctorInit->get_dtor() );
+                                                dtorCaller->get_statements()->get_kids().push_back( ctorInit->get_dtor()->clone() );
 
                                                 // on_exit(dtor_atexit);