Changeset 535adab

Timestamp:

May 19, 2017, 11:56:51 AM (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:

44264c5, d298e03

Parents:

27caf8d (diff), 8905f56 (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

Location:

src

Files:

• CodeGen/GenType.cc (modified) (2 diffs)
• GenPoly/InstantiateGeneric.cc (modified) (2 diffs)
• InitTweak/FixInit.cc (modified) (1 diff)
• SynTree/TypeSubstitution.cc (modified) (1 diff)
• main.cc (modified) (4 diffs)

src/CodeGen/GenType.cc

@@ -237 +237 @@
         void GenType::visit( TupleType * tupleType ) {
                 assertf( ! genC, "Tuple types should not reach code generation." );
-                Visitor::visit( tupleType );
                 unsigned int i = 0;
                 std::ostringstream os;
@@ -245 +244 @@
                         os << genType( t, "", pretty, genC, lineMarks ) << (i == tupleType->size() ? "" : ", ");
                 }
-                os << "]";
+                os << "] ";
                 typeString = os.str() + typeString;
         }

src/GenPoly/InstantiateGeneric.cc

@@ -367 +367 @@
                                 concDecl->set_body( inst->get_baseStruct()->has_body() );
                                 substituteMembers( inst->get_baseStruct()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
-                                DeclMutator::addDeclaration( concDecl );
-                                insert( inst, typeSubs, concDecl );
+                                insert( inst, typeSubs, concDecl ); // must insert before recursion
                                 concDecl->acceptMutator( *this ); // recursively instantiate members
+                                DeclMutator::addDeclaration( concDecl ); // must occur before declaration is added so that member instantiations appear first
                         }
                         StructInstType *newInst = new StructInstType( inst->get_qualifiers(), concDecl->get_name() );
@@ -422 +422 @@
                                 concDecl->set_body( inst->get_baseUnion()->has_body() );
                                 substituteMembers( inst->get_baseUnion()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
-                                DeclMutator::addDeclaration( concDecl );
-                                insert( inst, typeSubs, concDecl );
+                                insert( inst, typeSubs, concDecl ); // must insert before recursion
                                 concDecl->acceptMutator( *this ); // recursively instantiate members
+                                DeclMutator::addDeclaration( concDecl ); // must occur before declaration is added so that member instantiations appear first
                         }
                         UnionInstType *newInst = new UnionInstType( inst->get_qualifiers(), concDecl->get_name() );

src/InitTweak/FixInit.cc

@@ -619 +619 @@
 
                 Expression * FixCopyCtors::mutate( StmtExpr * stmtExpr ) {
-                        stmtExpr = safe_dynamic_cast< StmtExpr * >( Parent::mutate( stmtExpr ) );
+                        // function call temporaries should be placed at statement-level, rather than nested inside of a new statement expression,
+                        // since temporaries can be shared across sub-expressions, e.g.
+                        //   [A, A] f();
+                        //   g([A] x, [A] y);
+                        //   f(g());
+                        // f is executed once, so the return temporary is shared across the tuple constructors for x and y.
+                        std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
+                        for ( Statement *& stmt : stmts ) {
+                                stmt = stmt->acceptMutator( *this );
+                        } // for
+                        // stmtExpr = safe_dynamic_cast< StmtExpr * >( Parent::mutate( stmtExpr ) );
                         assert( stmtExpr->get_result() );
                         Type * result = stmtExpr->get_result();

src/SynTree/TypeSubstitution.cc

@@ -166 +166 @@
                         boundVars.insert( (*tyvar )->get_name() );
                 } // for
-        } // if
-        // bind type variables from generic type instantiations
-        std::list< TypeDecl* > *baseParameters = type->get_baseParameters();
-        if ( baseParameters && ! type->get_parameters().empty() ) {
-                for ( std::list< TypeDecl* >::const_iterator tyvar = baseParameters->begin(); tyvar != baseParameters->end(); ++tyvar ) {
-                        boundVars.insert( (*tyvar)->get_name() );
-                } // for
+                // bind type variables from generic type instantiations
+                std::list< TypeDecl* > *baseParameters = type->get_baseParameters();
+                if ( baseParameters && ! type->get_parameters().empty() ) {
+                        for ( std::list< TypeDecl* >::const_iterator tyvar = baseParameters->begin(); tyvar != baseParameters->end(); ++tyvar ) {
+                                boundVars.insert( (*tyvar)->get_name() );
+                        } // for
+                } // if
         } // if
         Type *ret = Mutator::mutate( type );

src/main.cc

@@ -64 +64 @@
         bresolvep = false,
         bboxp = false,
+        bcodegenp = false,
         ctorinitp = false,
         declstatsp = false,
@@ -306 +307 @@
                 OPTPRINT( "box" )
                 GenPoly::box( translationUnit );
+
+                if ( bcodegenp ) {
+                        dump( translationUnit );
+                        return 0;
+                }
 
                 if ( optind < argc ) {                                                  // any commands after the flags and input file ? => output file name
@@ -377 +383 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcdefglLmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcCdefglLmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -393 +399 @@
                   case 'c':                                                                             // print after constructors and destructors are replaced
                         ctorinitp = true;
+                        break;
+                  case 'C':                                                                             // print before code generation
+                        bcodegenp = true;
                         break;
                   case DeclStats: