Changeset 04cdd9b for src/GenPoly/GenPoly.h

Timestamp:

Aug 19, 2016, 2:42:04 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, 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:

e85a8631

Parents:

03da511 (diff), ac71a86 (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/GenPoly.h (modified) (2 diffs)

src/GenPoly/GenPoly.h

@@ -31 +31 @@
 namespace GenPoly {
         typedef ErasableScopedMap< std::string, TypeDecl::Kind > TyVarMap;
-        
-        /// A function needs an adapter if it returns a polymorphic value or if any of its
-        /// parameters have polymorphic type
-        bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVarr );
-
-        /// true iff function has polymorphic return type
-        ReferenceToType *isPolyRet( FunctionType *function );
 
         /// Replaces a TypeInstType by its referrent in the environment, if applicable
@@ -47 +40 @@
         /// 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 );
+
+        /// true iff function has dynamic-layout return type under the given type variable map
+        ReferenceToType *isDynRet( FunctionType *function, const TyVarMap &tyVars );
+
+        /// true iff function has dynamic-layout return type under the type variable map generated from its forall-parameters
+        ReferenceToType *isDynRet( FunctionType *function );
+
+        /// A function needs an adapter if it returns a dynamic-layout value or if any of its parameters have dynamic-layout type
+        bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVarr );
 
         /// returns polymorphic type if is pointer to polymorphic type, NULL otherwise; will look up substitution in env if provided