Changes in src/GenPoly/Box.cpp [d06273c:be4335b]

File:

• src/GenPoly/Box.cpp (modified) (12 diffs)

src/GenPoly/Box.cpp

@@ -366 +366 @@
 
         /// Passes extra layout arguments for sized polymorphic type parameters.
-        void passTypeVars(
+        ast::vector<ast::Expr>::iterator passTypeVars(
                 ast::ApplicationExpr * expr,
-                ast::vector<ast::Expr> & extraArgs,
                 ast::FunctionType const * funcType );
         /// Wraps a function application with a new temporary for the
@@ -388 +387 @@
         /// parameter list. arg should point into expr's argument list.
         void boxParams(
-                ast::ApplicationExpr * expr,
-                ast::Type const * polyRetType,
+                ast::ApplicationExpr const * expr,
+                ast::vector<ast::Expr>::iterator arg,
                 ast::FunctionType const * function,
                 const TypeVarMap & typeVars );
@@ -396 +395 @@
         void addInferredParams(
                 ast::ApplicationExpr * expr,
-                ast::vector<ast::Expr> & extraArgs,
+                ast::vector<ast::Expr>::iterator arg,
                 ast::FunctionType const * functionType,
                 const TypeVarMap & typeVars );
@@ -637 +636 @@
         ast::Expr const * ret = expr;
 
+        // TODO: This entire section should probably be refactored to do less
+        // pushing to the front/middle of a vector.
+        ptrdiff_t initArgCount = mutExpr->args.size();
+
         TypeVarMap exprTypeVars;
         makeTypeVarMap( function, exprTypeVars );
@@ -659 +662 @@
         }
 
-        ast::vector<ast::Expr> prependArgs;
-        passTypeVars( mutExpr, prependArgs, function );
-        addInferredParams( mutExpr, prependArgs, function, exprTypeVars );
-
-        boxParams( mutExpr, dynRetType, function, exprTypeVars );
-        spliceBegin( mutExpr->args, prependArgs );
+        assert( typeSubs );
+        ast::vector<ast::Expr>::iterator argIt =
+                passTypeVars( mutExpr, function );
+        addInferredParams( mutExpr, argIt, function, exprTypeVars );
+
+        argIt = mutExpr->args.begin();
+        std::advance( argIt, ( mutExpr->args.size() - initArgCount ) );
+
+        boxParams( mutExpr, argIt, function, exprTypeVars );
         passAdapters( mutExpr, function, exprTypeVars );
 
@@ -760 +766 @@
 }
 
-void CallAdapter::passTypeVars(
+ast::vector<ast::Expr>::iterator CallAdapter::passTypeVars(
                 ast::ApplicationExpr * expr,
-                ast::vector<ast::Expr> & extraArgs,
                 ast::FunctionType const * function ) {
         assert( typeSubs );
+        ast::vector<ast::Expr>::iterator arg = expr->args.begin();
         // Pass size/align for type variables.
         for ( ast::ptr<ast::TypeInstType> const & typeVar : function->forall ) {
@@ -774 +780 @@
                                                    toString( typeSubs ).c_str(), typeVar->typeString().c_str() );
                 }
-                extraArgs.emplace_back(
+                arg = expr->args.insert( arg,
                         new ast::SizeofExpr( expr->location, ast::deepCopy( concrete ) ) );
-                extraArgs.emplace_back(
+                arg++;
+                arg = expr->args.insert( arg,
                         new ast::AlignofExpr( expr->location, ast::deepCopy( concrete ) ) );
-        }
+                arg++;
+        }
+        return arg;
 }
 
@@ -904 +913 @@
 
 void CallAdapter::boxParams(
-                ast::ApplicationExpr * expr,
-                ast::Type const * polyRetType,
+                ast::ApplicationExpr const * expr,
+                ast::vector<ast::Expr>::iterator arg,
                 ast::FunctionType const * function,
                 const TypeVarMap & typeVars ) {
-        // Start at the beginning, but the return argument may have been added.
-        auto arg = expr->args.begin();
-        if ( polyRetType ) ++arg;
-
         for ( auto param : function->params ) {
                 assertf( arg != expr->args.end(),
@@ -923 +928 @@
 void CallAdapter::addInferredParams(
                 ast::ApplicationExpr * expr,
-                ast::vector<ast::Expr> & extraArgs,
+                ast::vector<ast::Expr>::iterator arg,
                 ast::FunctionType const * functionType,
                 TypeVarMap const & typeVars ) {
+        ast::vector<ast::Expr>::iterator cur = arg;
         for ( auto assertion : functionType->assertions ) {
                 auto inferParam = expr->inferred.inferParams().find(
@@ -934 +940 @@
                 ast::ptr<ast::Expr> newExpr = ast::deepCopy( inferParam->second.expr );
                 boxParam( newExpr, assertion->result, typeVars );
-                extraArgs.emplace_back( newExpr.release() );
+                cur = expr->args.insert( cur, newExpr.release() );
+                ++cur;
         }
 }
@@ -1109 +1116 @@
         );
 
-        for ( auto const & [assertArg, assertParam, assertReal] : group_iterate(
-                        realType->assertions, adapterType->assertions, adaptee->assertions ) ) {
+        for ( auto group : group_iterate( realType->assertions,
+                        adapterType->assertions, adaptee->assertions ) ) {
+                auto assertArg = std::get<0>( group );
+                auto assertParam = std::get<1>( group );
+                auto assertReal = std::get<2>( group );
                 adapteeApp->args.push_back( makeAdapterArg(
                         assertParam->var, assertArg->var->get_type(),
@@ -1967 +1977 @@
         bool hasDynamicLayout = false;
 
-        for ( auto const & [baseParam, typeParam] : group_iterate(
-                        baseParams, typeParams ) ) {
+        for ( auto pair : group_iterate( baseParams, typeParams ) ) {
+                auto baseParam = std::get<0>( pair );
+                auto typeParam = std::get<1>( pair );
                 if ( !baseParam->isComplete() ) continue;
                 ast::TypeExpr const * typeExpr = typeParam.as<ast::TypeExpr>();