Changeset c4187df for src/GenPoly

Timestamp:

Mar 22, 2017, 5:17:08 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

22854f8, 37f9860, ccd8bc3

Parents:

06ccbc7 (diff), c2bfb31 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/GenPoly

Files:

• Box.cc (modified) (1 diff)
• Specialize.cc (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -1298 +1298 @@
                         FunctionType * ftype = functionDecl->get_functionType();
                         if ( ! ftype->get_returnVals().empty() && functionDecl->get_statements() ) {
-                                if ( functionDecl->get_name() != "?=?" && ! isPrefix( functionDecl->get_name(), "_thunk" ) ) { // xxx - remove check for ?=? once reference types are in; remove check for prefix once thunks properly use ctor/dtors
+                                if ( functionDecl->get_name() != "?=?" && ! isPrefix( functionDecl->get_name(), "_thunk" ) && ! isPrefix( functionDecl->get_name(), "_adapter" ) ) { // xxx - remove check for ?=? once reference types are in; remove check for prefix once thunks properly use ctor/dtors
                                         assert( ftype->get_returnVals().size() == 1 );
                                         DeclarationWithType * retval = ftype->get_returnVals().front();

src/GenPoly/Specialize.cc

@@ -168 +168 @@
         }
 
+        struct EnvTrimmer : public Visitor {
+                TypeSubstitution * env, * newEnv;
+                EnvTrimmer( TypeSubstitution * env, TypeSubstitution * newEnv ) : env( env ), newEnv( newEnv ){}
+                virtual void visit( TypeDecl * tyDecl ) {
+                        // transfer known bindings for seen type variables
+                        if ( Type * t = env->lookup( tyDecl->get_name() ) ) {
+                                newEnv->add( tyDecl->get_name(), t );
+                        }
+                }
+        };
+
+        /// reduce environment to just the parts that are referenced in a given expression
+        TypeSubstitution * trimEnv( ApplicationExpr * expr, TypeSubstitution * env ) {
+                if ( env ) {
+                        TypeSubstitution * newEnv = new TypeSubstitution();
+                        EnvTrimmer trimmer( env, newEnv );
+                        expr->accept( trimmer );
+                        return newEnv;
+                }
+                return nullptr;
+        }
+
         /// Generates a thunk that calls `actual` with type `funType` and returns its address
         Expression * Specialize::createThunkFunction( FunctionType *funType, Expression *actual, InferredParams *inferParams ) {
@@ -211 +233 @@
                 }
 
-                appExpr->set_env( maybeClone( env ) );
+                appExpr->set_env( trimEnv( appExpr, env ) );
                 if ( inferParams ) {
                         appExpr->get_inferParams() = *inferParams;