Changes in src/GenPoly/InstantiateGeneric.cc [87c3bef:5a3ac84]

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (5 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -16 +16 @@
 #include <cassert>
 #include <list>
+#include <unordered_map>
 #include <utility>
 #include <vector>
-#include <unordered_map>
 
 #include "InstantiateGeneric.h"
@@ -25 +25 @@
 #include "GenPoly.h"
 #include "ScopedSet.h"
+#include "ScrubTyVars.h"
 #include "PolyMutator.h"
 
@@ -77 +78 @@
                         if ( params.size() != that.params.size() ) return false;
 
-                        SymTab::Indexer dummy;
                         for ( std::list< Type* >::const_iterator it = params.begin(), jt = that.params.begin(); it != params.end(); ++it, ++jt ) {
-                                if ( ! ResolvExpr::typesCompatible( *it, *jt, dummy ) ) return false;
+                                if ( ! typesPolyCompatible( *it, *jt ) ) return false;
                         }
                         return true;
@@ -227 +227 @@
                         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 ) );
+                                if ( isPolyType( paramType->get_type() ) ) {
+                                        // substitute polymorphic parameter type in to generic type
+                                        out.push_back( paramType->clone() );
+                                        gt = genericType::dynamic;
                                 } else {
-                                        // Just clone parameter type
-                                        out.push_back( paramType->clone() );
+                                        // normalize possibly dtype-static parameter type
+                                        out.push_back( new TypeExpr{ 
+                                                ScrubTyVars::scrubAll( paramType->get_type()->clone() ) } );
+                                        gt |= genericType::concrete;
                                 }
-                                // make the struct concrete or dynamic depending on the parameter
-                                gt |= isPolyType( paramType->get_type() ) ? genericType::dynamic : genericType::concrete;
                         } else switch ( (*baseParam)->get_kind() ) {
                                 case TypeDecl::Dtype:
@@ -372 +366 @@
                                 concDecl = new StructDecl( typeNamer.newName( inst->get_name() ) );
                                 concDecl->set_body( inst->get_baseStruct()->has_body() );
-                                substituteMembers( inst->get_baseStruct()->get_members(), *inst->get_baseParameters(), typeSubs,        concDecl->get_members() );
+                                substituteMembers( inst->get_baseStruct()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
                                 DeclMutator::addDeclaration( concDecl );
                                 insert( inst, typeSubs, concDecl );