Changeset e497c1d for src

Timestamp:

Jul 30, 2015, 4:07:23 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, 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, string, with_gc

Children:

5aa708c

Parents:

e01559c

Message:

fix adapter passing in function application when two types unify to the same type

Location:

src

Files:

• GenPoly/Box.cc (modified) (5 diffs)
• main.cc (modified) (3 diffs)

src/GenPoly/Box.cc

@@ -527 +527 @@
 
                 void Pass1::passAdapters( ApplicationExpr *appExpr, FunctionType *functionType, const TyVarMap &exprTyVars ) {
+                        // collect a list of function types passed as parameters or implicit parameters (assertions)
                         std::list< DeclarationWithType *> &paramList = functionType->get_parameters();
                         std::list< FunctionType *> functions;
@@ -537 +538 @@
                                 findFunction( (*arg)->get_type(), functions, exprTyVars, needsAdapter );
                         } // for
+
+                        // parameter function types for which an appropriate adapter has been generated.
+                        // we cannot use the types after applying substitutions, since two different 
+                        // parameter types may be unified to the same type
                         std::set< std::string > adaptersDone;
+
                         for ( std::list< FunctionType *>::iterator funType = functions.begin(); funType != functions.end(); ++funType ) {
                                 FunctionType *realFunction = (*funType)->clone();
-                                assert( env );
-                                env->apply( realFunction );
-
                                 std::string mangleName = SymTab::Mangler::mangle( realFunction );
+
+                                // only attempt to create an adapter or pass one as a parameter if we haven't 
+                                // already done so for this pre-substitution parameter function type.
                                 if ( adaptersDone.find( mangleName ) == adaptersDone.end() ) {
+                                        std::string mangleName = SymTab::Mangler::mangle( realFunction );
+                                        adaptersDone.insert( adaptersDone.begin(), mangleName );
+                                        
+                                        // apply substitution to type variables to figure out what the 
+                                        // adapter's type should look like
+                                        assert( env );
+                                        env->apply( realFunction );
+                                        mangleName = SymTab::Mangler::mangle( realFunction );
                                         AdapterMap & adapters = Pass1::adapters.top();
                                         AdapterMap::iterator adapter = adapters.find( mangleName );
@@ -555 +569 @@
                                                 continue;
                                         } else if ( adapter == adapters.end() ) {
+                                                // adapter has not been created yet in the current scope, so define it
                                                 FunctionDecl *newAdapter = makeAdapter( *funType, realFunction, mangleName, exprTyVars );
                                                 adapter = adapters.insert( adapters.begin(), std::pair< std::string, FunctionDecl *>( mangleName, newAdapter ) );
@@ -560 +575 @@
                                         } // if
                                         assert( adapter != adapters.end() );
+
+                                        // add the appropriate adapter as a parameter
                                         appExpr->get_args().push_front( new VariableExpr( adapter->second ) );
-                                        // appExpr->get_args().push_front( new NameExpr( makeAdapterName ( mangleName ) ) );
-                                        adaptersDone.insert( adaptersDone.begin(), mangleName );
                                 } // if
                         } // for
@@ -880 +895 @@
 
                 void Pass1::doBeginScope() {
+                        // actually, maybe this could (should?) push
+                        // a copy of the current map
                         adapters.push(AdapterMap());
                 }

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 15 16:45:24 2015
-// Update Count     : 145
+// Last Modified On : Tue Jul 28 13:05:02 2015
+// Update Count     : 165
 //
 
@@ -228 +228 @@
                 // add the assignment statement after the 
                 // initialization of a type parameter
-                OPTPRINT( "tweak" )
-                InitTweak::tweak( translationUnit );
                 OPTPRINT( "validate" )
                 SymTab::validate( translationUnit, symtabp );
@@ -251 +249 @@
                 OPTPRINT( "fixNames" ) 
                 CodeGen::fixNames( translationUnit );
+                OPTPRINT( "tweak" )
+                InitTweak::tweak( translationUnit );
 
                 if ( libcfap ) {