Changes in / [0e7ea335:65e9bc1]

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
-                                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
+                                // substitute parameter for complete (otype or sized dtype) type; makes the struct concrete or dynamic depending on the parameter
+                                out.push_back( paramType->clone() );
                                 gt |= isPolyType( paramType->get_type() ) ? genericType::dynamic : genericType::concrete;
                         } else switch ( (*baseParam)->get_kind() ) {