Changeset f80e0218 for src/InitTweak

Timestamp:

Jun 30, 2016, 4:32:56 PM (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, 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, stuck-waitfor-destruct, with_gc

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

Location:

src/InitTweak

Files:

• FixGlobalInit.cc (added)
• FixGlobalInit.h (added)
• FixInit.cc (added)
• FixInit.h (added)
• GenInit.cc (added)
• GenInit.h (moved) (moved from src/InitTweak/RemoveInit.h ) (2 diffs)
• InitModel.cc (modified) (3 diffs)
• InitTweak.cc (added)
• InitTweak.h (added)
• RemoveInit.cc (deleted)
• module.mk (modified) (1 diff)

src/InitTweak/GenInit.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// RemoveInit.h -- 
+// RemoveInit.h --
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Nov 27 17:00:47 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri May 13 11:27:19 2016
+// Update Count     : 3
 //
 
-#ifndef REMOVE_INIT_H
-#define REMOVE_INIT_H
+#ifndef GEN_INIT_H
+#define GEN_INIT_H
 
 #include <string>
@@ -25 +25 @@
 
 namespace InitTweak {
-        /// Adds assignment statements for polymorphic type initializers
-        void tweak( std::list< Declaration * > translationUnit );
-} // namespace 
+        /// Adds return value temporaries and wraps Initializers in ConstructorInit nodes
+        void genInit( std::list< Declaration * > & translationUnit );
+} // namespace
 
-#endif // GENPOLY_POLYMUTATOR_H
+#endif // INITTWEAK_GENINIT_H
 
 // Local Variables: //

src/InitTweak/InitModel.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// InitModel.cc -- 
+// InitModel.cc --
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:37:08 2015
-// Update Count     : 1
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Jan 07 13:38:46 2016
+// Update Count     : 5
 //
 
@@ -198 +198 @@
                 assert(init == 0 && single != 0);
                 std::list< Expression * > empty;
-                init = new SingleInit( single->get_expr(), empty );
+                init = new SingleInit( single->get_expr(), empty, false ); // cannot be constructed
                 return;
         }
@@ -214 +214 @@
                         } // if
 
-                init = new ListInit( contents );
+                std::list< Expression * > desig;
+                init = new ListInit( contents, desig, false ); // cannot be constructed
                 return;
         }

src/InitTweak/module.mk

@@ -11 +11 @@
 ## Created On       : Mon Jun  1 17:49:17 2015
 ## Last Modified By : Rob Schluntz
-## Last Modified On : Mon Jan 11 14:40:16 2016
-## Update Count     : 2
+## Last Modified On : Fri May 13 11:36:24 2016
+## Update Count     : 3
 ###############################################################################
 
-SRC += InitTweak/RemoveInit.cc
+SRC += InitTweak/GenInit.cc \
+        InitTweak/FixInit.cc \
+        InitTweak/FixGlobalInit.cc \
+        InitTweak/InitTweak.cc