Changeset 90152a4 for src/GenPoly/GenPoly.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 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:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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/GenPoly/GenPoly.cc (modified) (3 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);