Changeset b940dc71 for src/GenPoly/Box.cc

Timestamp:

Dec 21, 2016, 4:15:47 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, 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:

53e3b4a

Parents:

626dbc10

Message:

replace type variables in InstantiateGeneric?, fix call passTypeVars so that the correct type is passed

File:

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

src/GenPoly/Box.cc

@@ -1127 +1127 @@
                         makeTyVarMap( function, exprTyVars ); // xxx - should this take into account the variables already bound in scopeTyVars (i.e. remove them from exprTyVars?)
                         ReferenceToType *dynRetType = isDynRet( function, exprTyVars );
-                        Type *concRetType = appExpr->get_result()->isVoid() ? nullptr : appExpr->get_result();// ?: dynRetType; // xxx - is concRetType a good name?
-
+
+                        // NOTE: addDynRetParam needs to know the actual (generated) return type so it can make a temp variable, so pass the result type from the appExpr
+                        // passTypeVars needs to know the program-text return type (i.e. the distinction between _conc_T30 and T3(int))
+                        // concRetType may not be a good name in one or both of these places. A more appropriate name change is welcome.
                         if ( dynRetType ) {
+                                Type *concRetType = appExpr->get_result()->isVoid() ? nullptr : appExpr->get_result();
                                 ret = addDynRetParam( appExpr, function, concRetType, arg ); // xxx - used to use dynRetType instead of concRetType
                         } else if ( needsAdapter( function, scopeTyVars ) && ! needsAdapter( function, exprTyVars) ) { // xxx - exprTyVars is used above...?
@@ -1142 +1145 @@
                         arg = appExpr->get_args().begin();
 
+                        Type *concRetType = replaceWithConcrete( appExpr, dynRetType );
                         passTypeVars( appExpr, concRetType, arg, exprTyVars ); // xxx - used to use dynRetType instead of concRetType; this changed so that the correct type paramaters are passed for return types (it should be the concrete type's parameters, not the formal type's)
                         addInferredParams( appExpr, function, arg, exprTyVars );