Changeset 974906e2 for src/InitTweak

Timestamp:

Jan 11, 2016, 2:48:05 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:

a56767c

Parents:

1e9d87b

Message:

propagate maybeConstructed flag through system, begin create constructor/destructor statements for further processing by Resolver

Location:

src/InitTweak

Files:

• InitModel.cc (modified) (3 diffs)
• RemoveInit.cc (modified) (4 diffs)

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/RemoveInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jan 07 11:34:33 2016
-// Update Count     : 23
-//
-
+// Last Modified On : Mon Jan 11 14:41:26 2016
+// Update Count     : 118
+//
+
+#include <stack>
+#include <list>
 #include "RemoveInit.h"
 #include "SynTree/Declaration.h"
@@ -31 +33 @@
           public:
                 RemoveInit();
-                virtual ObjectDecl * mutate(ObjectDecl *objDecl);
+                virtual ObjectDecl * mutate( ObjectDecl *objDecl );
                 virtual DeclarationWithType * mutate( FunctionDecl *functionDecl );
 
                 virtual Statement * mutate( ReturnStmt * returnStmt );
-
-                virtual CompoundStmt * mutate(CompoundStmt * compoundStmt);
 
           protected:
@@ -44 +44 @@
         };
 
+        class CtorDtor : public GenPoly::PolyMutator {
+          public:
+                // CtorDtor();
+
+                virtual ObjectDecl * mutate( ObjectDecl * );
+
+                virtual CompoundStmt * mutate( CompoundStmt * compoundStmt );
+
+          protected:
+                typedef std::map< std::string, DeclarationWithType * > MMMMAP;
+                std::stack< MMMMAP > constructedObjects;
+
+                // to be added before block ends - use push_front so order is correct
+                std::list< Statement * > destructorStmts;
+        };
+
         void tweak( std::list< Declaration * > translationUnit ) {
                 RemoveInit remover;
+                CtorDtor ctordtor;
                 mutateAll( translationUnit, remover );
+                mutateAll( translationUnit, ctordtor );
         }
 
         RemoveInit::RemoveInit() : tempNamer( "_retVal" ) {}
-
-        CompoundStmt *RemoveInit::mutate(CompoundStmt *compoundStmt) {
-                mutateStatementList( compoundStmt->get_kids() );
-                return compoundStmt;
-        }
 
         // in the case where an object has an initializer and a polymorphic type, insert an assignment immediately after the
@@ -101 +114 @@
                 return decl;
         }
+
+        bool tryConstruct( ObjectDecl * objDecl ) {
+                // xxx - handle designations
+                return objDecl->get_init() == NULL ||
+                        ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() );
+        }
+
+        ExprStmt * makeCtorDtorStmt( std::string name, ObjectDecl * objDecl, std::list< Expression * > args ) {
+                UntypedExpr * expr = new UntypedExpr( new NameExpr( name ) );
+                expr->get_args().push_back( new VariableExpr( objDecl ) );
+                expr->get_args().splice( expr->get_args().end(), args );
+                return new ExprStmt( noLabels, expr );
+        }
+
+        // InitExpander ctor/dtor being marked as weak symbols
+        // this is causing a bug - Rodolfo's InitExpander is being constructed and destructed
+        // with different fields, which causes a segfault
+
+        class InitExpander : public Visitor {
+          public:
+          InitExpander() {}
+          // ~InitExpander() {}
+                virtual void visit( SingleInit * singleInit );
+                virtual void visit( ListInit * listInit );
+                std::list< Expression * > argList;
+        };
+
+        void InitExpander::visit( SingleInit * singleInit ) {
+                argList.push_back( singleInit->get_value()->clone() );
+        }
+
+        void InitExpander::visit( ListInit * listInit ) {
+                // xxx - for now, assume no nested list inits
+                std::list<Initializer*>::iterator it = listInit->begin_initializers();
+                for ( ; it != listInit->end_initializers(); ++it ) {
+                        (*it)->accept( *this );
+                }
+        }
+
+        std::list< Expression * > makeInitList( Initializer * init ) {
+                if ( init ) {
+                        InitExpander expander;
+                        // init->accept( expander );
+                        // std::list< Expression * > l = expander.argList;
+                        std::list< Expression * > l;
+                        return l;
+                } else {
+                        std::list< Expression * > l;
+                        return l;
+                }
+        }
+
+        ObjectDecl * CtorDtor::mutate( ObjectDecl * objDecl ) {
+                // hands off if designated or if @=
+                if ( tryConstruct( objDecl ) ) {
+                        ExprStmt * ctor = makeCtorDtorStmt( "?{}", objDecl, makeInitList( objDecl->get_init() ) );
+                        ExprStmt * dtor = makeCtorDtorStmt( "^?{}", objDecl, std::list< Expression * >() );
+
+                        // set_ctor...
+                        // need to remember init expression, in case no ctors exist
+                        // if ctor does exist, want to use ctor stmt instead of init
+                        objDecl->set_ctor( ctor );
+                        destructorStmts.push_front( dtor );
+                }
+                return objDecl;
+        }
+
+        CompoundStmt * CtorDtor::mutate( CompoundStmt * compoundStmt ) {
+                CompoundStmt * ret = PolyMutator::mutate( compoundStmt );
+                std::list< Statement * > &statements = ret->get_kids();
+                if ( ! destructorStmts.empty() ) {
+                        statements.splice( statements.end(), destructorStmts );
+                } // if
+                return ret;
+        }
+
+
+
 } // namespace InitTweak