Changeset a56767c for src/GenPoly


Ignore:
Timestamp:
Jan 11, 2016, 2:53:01 PM (9 years ago)
Author:
Rob Schluntz <rschlunt@…>
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, with_gc
Children:
77acda06
Parents:
974906e2 (diff), 61f9356 (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 ctor

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/GenPoly/Box.cc

    r974906e2 ra56767c  
    412412                void Pass1::boxParam( Type *param, Expression *&arg, const TyVarMap &exprTyVars ) {
    413413                        assert( ! arg->get_results().empty() );
    414 //   if ( ! dynamic_cast< PointerType *>( arg->get_results().front() ) ) {
    415                         TypeInstType *typeInst = dynamic_cast< TypeInstType *>( param );
    416                         if ( typeInst && exprTyVars.find( typeInst->get_name() ) != exprTyVars.end() ) {
     414                        if ( isPolyType( param, exprTyVars ) ) {
    417415                                if ( dynamic_cast< TypeInstType *>( arg->get_results().front() ) ) {
    418416                                        // if the argument's type is a type parameter, we don't need to box again!
     
    432430                                } // if
    433431                        } // if
    434 //   }
    435432                }
    436433
Note: See TracChangeset for help on using the changeset viewer.