Changeset a56767c for src/GenPoly

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:

• src/GenPoly/Box.cc (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -412 +412 @@
                 void Pass1::boxParam( Type *param, Expression *&arg, const TyVarMap &exprTyVars ) {
                         assert( ! arg->get_results().empty() );
-//   if ( ! dynamic_cast< PointerType *>( arg->get_results().front() ) ) {
-                        TypeInstType *typeInst = dynamic_cast< TypeInstType *>( param );
-                        if ( typeInst && exprTyVars.find( typeInst->get_name() ) != exprTyVars.end() ) {
+                        if ( isPolyType( param, exprTyVars ) ) {
                                 if ( dynamic_cast< TypeInstType *>( arg->get_results().front() ) ) {
                                         // if the argument's type is a type parameter, we don't need to box again!
@@ -432 +430 @@
                                 } // if
                         } // if
-//   }
                 }