Changes in src/GenPoly/Box.cc [474a170:271a5d3]

File:

• src/GenPoly/Box.cc (modified) (16 diffs)

src/GenPoly/Box.cc

@@ -37 +37 @@
 #include "InitTweak/InitTweak.h"         // for getFunctionName, isAssignment
 #include "Lvalue.h"                      // for generalizedLvalue
+#include "ResolvExpr/TypeEnvironment.h"  // for EqvClass
 #include "ResolvExpr/typeops.h"          // for typesCompatible
 #include "ScopedSet.h"                   // for ScopedSet, ScopedSet<>::iter...
@@ -94 +95 @@
                   private:
                         /// Pass the extra type parameters from polymorphic generic arguments or return types into a function application
-                        /// Will insert 0, 2 or 3 more arguments.
-                        std::list< Expression *>::iterator passArgTypeVars( ApplicationExpr *appExpr, Type *parmType, Type *argBaseType, std::list< Expression *>::iterator arg, const TyVarMap &exprTyVars, std::set< std::string > &seenTypes );
+                        void passArgTypeVars( ApplicationExpr *appExpr, Type *parmType, Type *argBaseType, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars, std::set< std::string > &seenTypes );
                         /// passes extra type parameters into a polymorphic function application
                         /// Returns an iterator to the first argument after the added
@@ -488 +488 @@
                                 makeTyVarMap( functionType, scopeTyVars );
 
+                                std::list< DeclarationWithType *> &paramList = functionType->parameters;
                                 std::list< FunctionType const *> functions;
                                 for ( TypeDecl * const tyVar : functionType->forall ) {
@@ -494 +495 @@
                                         } // for
                                 } // for
-                                for ( DeclarationWithType * const arg : functionType->parameters ) {
+                                for ( DeclarationWithType * const arg : paramList ) {
                                         findFunction( arg->get_type(), functions, scopeTyVars, needsAdapter );
                                 } // for
@@ -531 +532 @@
                 }
 
-                std::list< Expression *>::iterator Pass1::passArgTypeVars( ApplicationExpr *appExpr, Type *parmType, Type *argBaseType, std::list< Expression *>::iterator arg, const TyVarMap &exprTyVars, std::set< std::string > &seenTypes ) {
+                void Pass1::passArgTypeVars( ApplicationExpr *appExpr, Type *parmType, Type *argBaseType, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars, std::set< std::string > &seenTypes ) {
                         Type *polyType = isPolyType( parmType, exprTyVars );
                         if ( polyType && ! dynamic_cast< TypeInstType* >( polyType ) ) {
                                 std::string typeName = mangleType( polyType );
-                                if ( seenTypes.count( typeName ) ) return arg;
+                                if ( seenTypes.count( typeName ) ) return;
 
                                 arg = appExpr->get_args().insert( arg, new SizeofExpr( argBaseType->clone() ) );
@@ -555 +556 @@
                                 seenTypes.insert( typeName );
                         }
-                        return arg;
                 }
 
@@ -562 +562 @@
                         std::list< Expression *>::iterator arg = appExpr->args.begin();
                         // pass size/align for type variables
-                        // NOTE: This is iterating over a map. This means the sorting
-                        // order of the keys changes behaviour, as the iteration order
-                        // is visible outside the loop. - The order matches the orignal
-                        // order because the vars have been renamed with numbers that,
-                        // even when converted to strings, sort in the original order.
-                        // (At least, that is the best explination I have.)
                         for ( std::pair<std::string, TypeDecl::Data> const & tyParam : exprTyVars ) {
-                                if ( !tyParam.second.isComplete ) continue;
-                                Type *concrete = env->lookup( tyParam.first );
-                                // If there is an unbound type variable, it should have detected already.
-                                assertf( concrete, "Unbound type variable: %s in: %s",
-                                        toCString( tyParam.first ), toCString( *env ) );
-
-                                arg = appExpr->get_args().insert( arg, new SizeofExpr( concrete->clone() ) );
-                                arg++;
-                                arg = appExpr->get_args().insert( arg, new AlignofExpr( concrete->clone() ) );
-                                arg++;
+                                ResolvExpr::EqvClass eqvClass;
+                                if ( tyParam.second.isComplete ) {
+                                        Type *concrete = env->lookup( tyParam.first );
+                                        // If there is an unbound type variable, it should have detected already.
+                                        assertf( concrete, "Unbound type variable: %s in: %s",
+                                                toCString( tyParam.first ), toCString( *env ) );
+
+                                        arg = appExpr->get_args().insert( arg, new SizeofExpr( concrete->clone() ) );
+                                        arg++;
+                                        arg = appExpr->get_args().insert( arg, new AlignofExpr( concrete->clone() ) );
+                                        arg++;
+                                } // if
                         } // for
 
@@ -586 +582 @@
                         assert( funcType );
 
-                        // Iterator over the original function arguments.
-                        std::list< Expression* >::const_iterator fnArg;
-                        // Names for generic types we've seen.
-                        std::set< std::string > seenTypes;
+                        // These iterators don't advance in unison.
+                        std::list< DeclarationWithType* >::const_iterator fnParm = funcType->get_parameters().begin();
+                        std::list< Expression* >::const_iterator fnArg = arg;
+                        std::set< std::string > seenTypes; ///< names for generic types we've seen
 
                         // a polymorphic return type may need to be added to the argument list
                         if ( polyRetType ) {
                                 Type *concRetType = replaceWithConcrete( polyRetType, env );
-                                arg = passArgTypeVars( appExpr, polyRetType, concRetType, arg, exprTyVars, seenTypes );
-                                // Skip the return parameter in the argument list.
-                                fnArg = arg + 1;
-                        } else {
-                                fnArg = arg;
+                                passArgTypeVars( appExpr, polyRetType, concRetType, arg, exprTyVars, seenTypes );
+                                ++fnArg; // skip the return parameter in the argument list
                         }
 
                         // add type information args for presently unseen types in parameter list
-                        std::list< DeclarationWithType* >::const_iterator fnParm = funcType->get_parameters().begin();
                         for ( ; fnParm != funcType->get_parameters().end() && fnArg != appExpr->get_args().end(); ++fnParm, ++fnArg ) {
+                                if ( ! (*fnArg)->get_result() ) continue;
                                 Type * argType = (*fnArg)->get_result();
-                                if ( ! argType ) continue;
-                                arg = passArgTypeVars( appExpr, (*fnParm)->get_type(), argType, arg, exprTyVars, seenTypes );
+                                passArgTypeVars( appExpr, (*fnParm)->get_type(), argType, arg, exprTyVars, seenTypes );
                         }
                         return arg;
@@ -688 +680 @@
                 Expression *Pass1::applyAdapter( ApplicationExpr *appExpr, FunctionType *function ) {
                         Expression *ret = appExpr;
+//                      if ( ! function->get_returnVals().empty() && isPolyType( function->get_returnVals().front()->get_type(), tyVars ) ) {
                         if ( isDynRet( function, scopeTyVars ) ) {
                                 ret = addRetParam( appExpr, function->returnVals.front()->get_type() );
@@ -779 +772 @@
 
                 void Pass1::addInferredParams( ApplicationExpr *appExpr, std::list< Expression *>::iterator arg, FunctionType *functionType, const TyVarMap &tyVars ) {
+                        std::list< Expression *>::iterator cur = arg;
                         for ( TypeDecl * const tyVar : functionType->forall ) {
                                 for ( DeclarationWithType * const assert : tyVar->assertions ) {
@@ -785 +779 @@
                                         Expression *newExpr = inferParam->second.expr->clone();
                                         boxParam( newExpr, assert->get_type(), tyVars );
-                                        arg = appExpr->get_args().insert( arg, newExpr );
-                                        ++arg;
+                                        appExpr->get_args().insert( cur, newExpr );
                                 } // for
                         } // for
@@ -929 +922 @@
                                 // 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.
-                                // The second part of the insert result is "is the value new".
-                                if ( adaptersDone.insert( mangleName ).second ) {
+                                if ( adaptersDone.find( mangleName ) == adaptersDone.end() ) {
+                                        adaptersDone.insert( adaptersDone.begin(), mangleName );
 
                                         // apply substitution to type variables to figure out what the adapter's type should look like
@@ -1113 +1106 @@
 
                         Expression *ret = appExpr;
-                        // Save iterator to the first original parameter (works with lists).
                         std::list< Expression *>::iterator paramBegin = appExpr->get_args().begin();
 
@@ -1180 +1172 @@
 
                 void Pass1::premutate( AddressExpr * ) { visit_children = false; }
-
                 Expression * Pass1::postmutate( AddressExpr * addrExpr ) {
                         assert( addrExpr->arg->result && ! addrExpr->arg->result->isVoid() );
@@ -1241 +1232 @@
 
                 void Pass2::addAdapters( FunctionType *functionType ) {
+                        std::list< DeclarationWithType *> &paramList = functionType->parameters;
                         std::list< FunctionType const *> functions;
                         for ( DeclarationWithType * const arg : functionType->parameters ) {
@@ -1253 +1245 @@
                                         std::string adapterName = makeAdapterName( mangleName );
                                         // adapter may not be used in body, pass along with unused attribute.
-                                        functionType->parameters.push_front(
-                                                new ObjectDecl( adapterName, Type::StorageClasses(), LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), makeAdapterType( funType, scopeTyVars ) ), 0, { new Attribute( "unused" ) } ) );
+                                        paramList.push_front( new ObjectDecl( adapterName, Type::StorageClasses(), LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), makeAdapterType( funType, scopeTyVars ) ), 0, { new Attribute( "unused" ) } ) );
                                         adaptersDone.insert( adaptersDone.begin(), mangleName );
                                 }
                         }
+//  deleteAll( functions );
                 }