Changeset 4ee36bf0 for src/InitTweak

Timestamp:

Nov 8, 2017, 2:50:35 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

049ead9

Parents:

136ccd7 (diff), e35f30a (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 cleanup-dtors

File:

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

src/InitTweak/GenInit.cc

@@ -214 +214 @@
                 }
                 // a type is managed if it appears in the map of known managed types, or if it contains any polymorphism (is a type variable or generic type containing a type variable)
-                return managedTypes.find( SymTab::Mangler::mangle( type ) ) != managedTypes.end() || GenPoly::isPolyType( type );
+                return managedTypes.find( SymTab::Mangler::mangleConcrete( type ) ) != managedTypes.end() || GenPoly::isPolyType( type );
         }
 
@@ -232 +232 @@
                         Type * type = InitTweak::getPointerBase( params.front()->get_type() );
                         assert( type );
-                        managedTypes.insert( SymTab::Mangler::mangle( type ) );
+                        managedTypes.insert( SymTab::Mangler::mangleConcrete( type ) );
                 }
         }
@@ -242 +242 @@
                         if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
                                 if ( isManaged( field ) ) {
+                                        // generic parameters should not play a role in determining whether a generic type is constructed - construct all generic types, so that
+                                        // polymorphic constructors make generic types managed types
                                         StructInstType inst( Type::Qualifiers(), aggregateDecl );
-                                        managedTypes.insert( SymTab::Mangler::mangle( &inst ) );
+                                        managedTypes.insert( SymTab::Mangler::mangleConcrete( &inst ) );
                                         break;
                                 }