Changeset 6d160d7

Timestamp:

Jan 22, 2016, 2:21:29 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

8488c715

Parents:

32805db

Message:

Fixed type scrubbing for pointers to polymorphic generic types

File:

• src/GenPoly/ScrubTyVars.cc (modified) (1 diff)

src/GenPoly/ScrubTyVars.cc

@@ -82 +82 @@
 
         Type * ScrubTyVars::mutate( PointerType *pointer ) {
-                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( pointer->get_base() ) ) {
-                        if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
-                                Type *ret = mutate( typeInst );
-                                ret->get_qualifiers() += pointer->get_qualifiers();
-                                pointer->set_base( 0 );
-                                delete pointer;
-                                return ret;
-                        } // if
-                } // if
+                if ( Type *polyType = isPolyType( pointer->get_base(), tyVars ) ) {
+                        Type *ret = polyType->acceptMutator( *this );
+                        ret->get_qualifiers() += pointer->get_qualifiers();
+                        pointer->set_base( 0 );
+                        delete pointer;
+                        return ret;
+                }
                 return Mutator::mutate( pointer );
         }