Changeset 9e2c1f0 for src/InitTweak

Timestamp:

May 6, 2016, 4:28:50 PM (9 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:

ec79847

Parents:

99ee64d (diff), 03e5d14 (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 'global-init' into ctor and add global destroy function to call destructors on global objects

Conflicts:

src/CodeGen/CodeGenerator.cc
src/InitTweak/module.mk
src/Makefile.in
src/SynTree/Declaration.h
src/SynTree/FunctionDecl.cc
src/main.cc

Location:

src/InitTweak

Files:

• FixGlobalInit.cc (added)
• FixGlobalInit.h (added)
• GenInit.cc (modified) (3 diffs)
• GenInit.h (modified) (2 diffs)
• module.mk (modified) (1 diff)

src/InitTweak/GenInit.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 28 12:26:47 2016
+// Last Modified On : Fri May 06 16:11:15 2016
 // Update Count     : 166
 //
@@ -129 +129 @@
         }
 
+        bool tryConstruct( ObjectDecl * objDecl ) {
+                // xxx - handle designations
+                return ! LinkageSpec::isBuiltin( objDecl->get_linkage() ) &&
+                        (objDecl->get_init() == NULL ||
+                        ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() ));
+        }
         namespace {
-                bool tryConstruct( ObjectDecl * objDecl ) {
-                        // xxx - handle designations
-                        return ! LinkageSpec::isBuiltin( objDecl->get_linkage() ) &&
-                                (objDecl->get_init() == NULL ||
-                                ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() ));
-                }
 
                 Expression * makeCtorDtorExpr( std::string name, ObjectDecl * objDecl, std::list< Expression * > args ) {
@@ -209 +209 @@
                                         objDecl->set_init( new ConstructorInit( ctorStmt, dtorStmt, objDecl->get_init() ) );
                                 }
-                        } else {
-                                // xxx - find a way to construct/destruct globals
-                                // hack: implicit "static" initialization routine for each struct type? or something similar?
-                                // --ties into module system
-                                // this can be done by mangling main and replacing it with our own main which calls each
-                                // module initialization routine in some decided order (order given in link command?)
-                                // and finally calls mangled main
                         }
                 }

src/InitTweak/GenInit.h ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 28 12:22:09 2016
+// Last Modified On : Fri May 06 16:18:22 2016
 // Update Count     : 3
 //
@@ -27 +27 @@
         /// Adds return value temporaries and wraps Initializers in ConstructorInit nodes
         void genInit( std::list< Declaration * > & translationUnit );
+        /// True if the resolver should try to construct objDecl
+        bool tryConstruct( ObjectDecl * objDecl );
 } // namespace
 
-#endif // GENPOLY_POLYMUTATOR_H
+#endif // INITTWEAK_GENINIT_H
 
 // Local Variables: //

src/InitTweak/module.mk ¶

@@ -11 +11 @@
 ## Created On       : Mon Jun  1 17:49:17 2015
 ## Last Modified By : Rob Schluntz
-## Last Modified On : Thu Apr 28 12:23:17 2016
+## Last Modified On : Fri May 06 15:59:27 2016
 ## Update Count     : 3
 ###############################################################################
 
 SRC += InitTweak/GenInit.cc \
-        InitTweak/FixInit.cc
+        InitTweak/FixInit.cc \
+        InitTweak/FixGlobalInit.cc
+