Changes in src/GenPoly/GenPoly.cc [8d7bef2:682dcae]

File:

• src/GenPoly/GenPoly.cc (modified) (4 diffs)

src/GenPoly/GenPoly.cc

@@ -100 +100 @@
                 if ( dynamic_cast< TypeInstType * >( type ) ) {
                         return type;
+                } else if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
+                        return isPolyType( arrayType->base, env );
                 } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
                         if ( hasPolyParams( structType->get_parameters(), env ) ) return type;
@@ -115 +117 @@
                                 return type;
                         }
+                } else if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
+                        return isPolyType( arrayType->base, tyVars, env );
                 } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
                         if ( hasPolyParams( structType->get_parameters(), tyVars, env ) ) return type;
@@ -367 +371 @@
                         return is<VoidType>( ap->get_base() ) || is<VoidType>( bp->get_base() )
                                 || typesPolyCompatible( ap->get_base(), bp->get_base() );
+                } else if ( aid == type_index{typeid(ReferenceType)} ) {
+                        ReferenceType *ap = as<ReferenceType>(a), *bp = as<ReferenceType>(b);
+                        return is<VoidType>( ap->get_base() ) || is<VoidType>( bp->get_base() )
+                                || typesPolyCompatible( ap->get_base(), bp->get_base() );
                 } else if ( aid == type_index{typeid(ArrayType)} ) {
                         ArrayType *aa = as<ArrayType>(a), *ba = as<ArrayType>(b);
@@ -437 +445 @@
                 Type * newType = arg->clone();
                 if ( env ) env->apply( newType );
+                std::unique_ptr<Type> manager( newType );
                 // if the argument's type is polymorphic, we don't need to box again!
                 return ! isPolyType( newType );