Changeset 0e7ea335

Timestamp:

Mar 8, 2017, 3:27:26 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

3f414ef, 861799c

Parents:

65e9bc1 (diff), be8bd88 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• CodeTools/DeclStats.cc (modified) (1 diff)
• GenPoly/InstantiateGeneric.cc (modified) (1 diff)

src/CodeTools/DeclStats.cc

@@ -186 +186 @@
                         auto& args = expr->get_args();
                         unsigned fanout = args.size();
+                        
                         ++exprs_by_fanout_at_depth[ std::make_pair(depth, fanout) ];
                         for ( Expression* arg : args ) {

src/GenPoly/InstantiateGeneric.cc

@@ -226 +226 @@
 
                         if ( (*baseParam)->isComplete() ) {
-                                // substitute parameter for complete (otype or sized dtype) type; makes the struct concrete or dynamic depending on the parameter
-                                out.push_back( paramType->clone() );
+                                // substitute parameter for complete (otype or sized dtype) type
+                                int pointerLevels = 0;
+                                if ( hasPolyBase( paramType->get_type(), &pointerLevels ) && pointerLevels > 0 ) {
+                                        // Make a void* with equivalent nesting
+                                        Type* voidPtr = new VoidType( Type::Qualifiers() );
+                                        while ( pointerLevels > 0 ) {
+                                                // Just about data layout, so qualifiers *shouldn't* matter
+                                                voidPtr = new PointerType( Type::Qualifiers(), voidPtr );
+                                                --pointerLevels;
+                                        }
+                                        out.push_back( new TypeExpr( voidPtr ) );
+                                } else {
+                                        // Just clone parameter type
+                                        out.push_back( paramType->clone() );
+                                }
+                                // make the struct concrete or dynamic depending on the parameter
                                 gt |= isPolyType( paramType->get_type() ) ? genericType::dynamic : genericType::concrete;
                         } else switch ( (*baseParam)->get_kind() ) {