Changeset 33a7b6d for src/GenPoly/GenPoly.cc

Timestamp:

Nov 15, 2016, 5:30:52 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

d9fa60a

Parents:

8f9cc50

Message:

changed use of formal types to actual types for boxing return parameters and passing type variables, fix bug where generic struct's members would change types when a member is accessed on a concrete instantiation

File:

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

src/GenPoly/GenPoly.cc

@@ -92 +92 @@
         }
 
-        Type *isDynType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
+        ReferenceToType *isDynType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
 
@@ -98 +98 @@
                         auto var = tyVars.find( typeInst->get_name() );
                         if ( var != tyVars.end() && var->second == TypeDecl::Any ) {
-                                return type;
+                                return typeInst;
                         }
                 } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
-                        if ( hasDynParams( structType->get_parameters(), tyVars, env ) ) return type;
+                        if ( hasDynParams( structType->get_parameters(), tyVars, env ) ) return structType;
                 } else if ( UnionInstType *unionType = dynamic_cast< UnionInstType* >( type ) ) {
-                        if ( hasDynParams( unionType->get_parameters(), tyVars, env ) ) return type;
+                        if ( hasDynParams( unionType->get_parameters(), tyVars, env ) ) return unionType;
                 }
                 return 0;