Changeset ac9ca96 for src/InitTweak

Timestamp:

Oct 13, 2016, 11:19:23 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

7756647

Parents:

65660bd

Message:

consider tuples managed if a tuple constructor is declared, combine environments in tuple assignment

File:

• src/InitTweak/GenInit.cc (modified) (2 diffs)

src/InitTweak/GenInit.cc

@@ -238 +238 @@
 
         bool CtorDtor::isManaged( Type * type ) const {
+                if ( TupleType * tupleType = dynamic_cast< TupleType * > ( type ) ) {
+                        // tuple is also managed if any of its components are managed
+                        if ( std::any_of( tupleType->get_types().begin(), tupleType->get_types().end(), [&](Type * type) { return isManaged( type ); }) ) {
+                                return true;
+                        }
+                }
                 return managedTypes.find( SymTab::Mangler::mangle( type ) ) != managedTypes.end();
         }
@@ -245 +251 @@
                 while ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
                         type = at->get_base();
-                }
-                if ( TupleType * tupleType = dynamic_cast< TupleType * > ( type ) ) {
-                        return std::any_of( tupleType->get_types().begin(), tupleType->get_types().end(), [&](Type * type) { return isManaged( type ); });
                 }
                 return isManaged( type );