Changeset 6f326b1

Timestamp:

May 2, 2018, 11:44:47 AM (7 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, with_gc

Children:

30dcc47

Parents:

43bd69d

Message:

Add type variables from function alternative to the type environment for WaitforStmt?

Location:

src/ResolvExpr

Files:

• AlternativeFinder.h (modified) (1 diff)
• Resolver.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.h

@@ -126 +126 @@
         void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt = 0 );
 
+        /// Adds type variables to the open variable set and marks their assertions
+        void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions );
+
         template< typename InputIterator >
         void simpleCombineEnvironments( InputIterator begin, InputIterator end, TypeEnvironment &result ) {

src/ResolvExpr/Resolver.cc

@@ -544 +544 @@
                                                         OpenVarSet openVars;
                                                         AssertionSet resultNeed, resultHave;
-                                                        TypeEnvironment resultEnv;
+                                                        TypeEnvironment resultEnv( func.env );
+                                                        makeUnifiableVars( function, openVars, resultNeed );
+                                                        // add all type variables as open variables now so that those not used in the parameter
+                                                        // list are still considered open.
+                                                        resultEnv.add( function->forall );
 
                                                         // Load type variables from arguemnts into one shared space