Changeset 33a7b6d for src/GenPoly

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

Location:

src/GenPoly

Files:

• Box.cc (modified) (3 diffs)
• GenPoly.cc (modified) (2 diffs)
• GenPoly.h (modified) (6 diffs)

src/GenPoly/Box.cc ¶

@@ -1288 +1288 @@
                         TyVarMap exprTyVars( (TypeDecl::Kind)-1 );
                         makeTyVarMap( function, exprTyVars );
+                        ReferenceToType *concRetType = dynamic_cast< ReferenceToType* >( appExpr->get_result() ); // xxx - is concRetType a good name?
                         ReferenceToType *dynRetType = isDynRet( function, exprTyVars );
 
                         if ( dynRetType ) {
-                                ret = addDynRetParam( appExpr, function, dynRetType, arg );
+                                ret = addDynRetParam( appExpr, function, concRetType, arg ); // xxx - used to use dynRetType instead of concRetType
                         } else if ( needsAdapter( function, scopeTyVars ) ) {
                                 // std::cerr << "needs adapter: ";
@@ -1301 +1302 @@
                         arg = appExpr->get_args().begin();
 
-                        passTypeVars( appExpr, dynRetType, arg, exprTyVars );
+                        passTypeVars( appExpr, concRetType, arg, exprTyVars ); // xxx - used to use dynRetType instead of concRetType
                         addInferredParams( appExpr, function, arg, exprTyVars );
 
@@ -1364 +1365 @@
                         // line below cloned from FixFunction.cc
                         // xxx - functionObj is never added to a list of declarations...
+                        // alternatively, this function could return a new VariableExpr( functionDecl ) and change the result type of the new expression
                         ObjectDecl *functionObj = new ObjectDecl( functionDecl->get_name(), functionDecl->get_storageClass(), functionDecl->get_linkage(), 0,
                                                                   new PointerType( Type::Qualifiers(), functionDecl->get_type()->clone() ), 0 );

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;

src/GenPoly/GenPoly.h ¶

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenPoly.h -- 
+// GenPoly.h --
 //
 // Author           : Richard C. Bilson
@@ -34 +34 @@
         /// Replaces a TypeInstType by its referrent in the environment, if applicable
         Type* replaceTypeInst( Type* type, const TypeSubstitution* env );
-        
+
         /// returns polymorphic type if is polymorphic type, NULL otherwise; will look up substitution in env if provided
         Type *isPolyType( Type *type, const TypeSubstitution *env = 0 );
-        
+
         /// returns polymorphic type if is polymorphic type in tyVars, NULL otherwise; will look up substitution in env if provided
         Type *isPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );
 
         /// returns dynamic-layout type if is dynamic-layout type in tyVars, NULL otherwise; will look up substitution in env if provided
-        Type *isDynType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );
+        ReferenceToType *isDynType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );
 
         /// true iff function has dynamic-layout return type under the given type variable map
@@ -55 +55 @@
         /// returns polymorphic type if is pointer to polymorphic type, NULL otherwise; will look up substitution in env if provided
         Type *isPolyPtr( Type *type, const TypeSubstitution *env = 0 );
-        
+
         /// returns polymorphic type if is pointer to polymorphic type in tyVars, NULL otherwise; will look up substitution in env if provided
         Type *isPolyPtr( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );
@@ -76 +76 @@
         /// Adds the declarations in the forall list of type (and its pointed-to type if it's a pointer type) to `tyVarMap`
         void makeTyVarMap( Type *type, TyVarMap &tyVarMap );
-        
+
         /// Prints type variable map
         void printTyVarMap( std::ostream &os, const TyVarMap &tyVarMap );
@@ -82 +82 @@
         /// Gets the mangled name of this type; alias for SymTab::Mangler::mangleType().
         inline std::string mangleType( Type *ty ) { return SymTab::Mangler::mangleType( ty ); }
-        
+
         /// Gets the name of the sizeof parameter for the type, given its mangled name
         inline std::string sizeofName( const std::string &name ) { return std::string( "_sizeof_" ) + name; }
@@ -94 +94 @@
         /// Gets the name of the layout function for a given aggregate type, given its declaration
         inline std::string layoutofName( AggregateDecl *decl ) { return std::string( "_layoutof_" ) + decl->get_name(); }
-        
+
 } // namespace GenPoly