Changeset f80e0218 for src/GenPoly/GenPoly.h

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

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
@@ -39 +39 @@
         ReferenceToType *isPolyRet( FunctionType *function );
 
+        /// 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 );