Changes in src/GenPoly/BoxNew.cpp [0bf0b978:d3652df]

File:

• src/GenPoly/BoxNew.cpp (modified) (16 diffs)

src/GenPoly/BoxNew.cpp

@@ -94 +94 @@
 
 /// Adds parameters for otype size and alignment to a function type.
-void addSTypeParams(
-                ast::vector<ast::DeclWithType> & params,
+void addOTypeParams(
+                ast::FunctionDecl * decl,
                 ast::vector<ast::TypeDecl> const & sizedParams ) {
+        // TODO: Can we fold this into buildLayoutFunction to avoid rebuilding?
+        ast::FunctionType * type = ast::mutate( decl->type.get() );
         for ( ast::ptr<ast::TypeDecl> const & sizedParam : sizedParams ) {
                 ast::TypeInstType inst( sizedParam );
                 std::string paramName = Mangle::mangleType( &inst );
-                params.emplace_back( new ast::ObjectDecl(
+                decl->params.emplace_back( new ast::ObjectDecl(
                         sizedParam->location,
                         sizeofName( paramName ),
                         makeSizeAlignType()
                 ) );
-                params.emplace_back( new ast::ObjectDecl(
+                type->params.emplace_back( makeSizeAlignType() );
+                decl->params.emplace_back( new ast::ObjectDecl(
                         sizedParam->location,
                         alignofName( paramName ),
                         makeSizeAlignType()
                 ) );
-        }
+                type->params.emplace_back( makeSizeAlignType() );
+        }
+        decl->type = type;
 }
 
@@ -124 +129 @@
 };
 
+// TODO: Is there a better way to handle the different besides a flag?
 LayoutData buildLayoutFunction(
                 CodeLocation const & location, ast::AggregateDecl const * aggr,
-                ast::vector<ast::TypeDecl> const & sizedParams,
                 bool isInFunction, bool isStruct ) {
         ast::ObjectDecl * sizeParam = new ast::ObjectDecl(
@@ -148 +153 @@
                 params.push_back( offsetParam );
         }
-        addSTypeParams( params, sizedParams );
 
         // Routines at global scope marked "static" to prevent multiple
@@ -234 +238 @@
 
         // Build layout function signature.
-        LayoutData layout = buildLayoutFunction(
-                location, decl, sizedParams, isInFunction(), true );
+        LayoutData layout =
+                buildLayoutFunction( location, decl, isInFunction(), true );
         ast::FunctionDecl * layoutDecl = layout.function;
         // Also return these or extract them from the parameter list?
@@ -242 +246 @@
         ast::ObjectDecl const * offsetofParam = layout.offsetofParam;
         assert( nullptr != layout.offsetofParam );
+        addOTypeParams( layoutDecl, sizedParams );
 
         // Calculate structure layout in function body.
@@ -308 +313 @@
 
         // Build layout function signature.
-        LayoutData layout = buildLayoutFunction(
-                location, decl, sizedParams, isInFunction(), false );
+        LayoutData layout =
+                buildLayoutFunction( location, decl, isInFunction(), false );
         ast::FunctionDecl * layoutDecl = layout.function;
         // Also return these or extract them from the parameter list?
@@ -315 +320 @@
         ast::ObjectDecl const * alignofParam = layout.alignofParam;
         assert( nullptr == layout.offsetofParam );
+        addOTypeParams( layoutDecl, sizedParams );
 
         // Calculate union layout in function body.
@@ -635 +641 @@
         // the variable can be reused as a parameter to the call rather than
         // creating a new temporary variable. Previously this step was an
-        // optimization, but with the introduction of tuples and UniqueExprs,
-        // it is necessary to ensure that they use the same variable.
+        // optimization, but
+        // ...
+        // with the introduction of tuples and UniqueExprs, it is necessary to
+        // ensure that they use the same variable.
         // Essentially, looking for pattern:
         // (x=f(...), x)
@@ -681 +689 @@
         // the distinction between _conc_T30 and T3(int)) concRetType may not be
         // a good name in one or both of these places.
+        // TODO A more appropriate name change is welcome.
         if ( dynRetType ) {
                 ast::Type const * result = mutExpr->result;
@@ -689 +698 @@
         } else if ( needsAdapter( function, scopeTypeVars )
                         && !needsAdapter( function, exprTypeVars ) ) {
+                // TODO:
+                // The !needsAdapter check may be incorrect. It seems there is some
+                // situation where an adapter is applied where it shouldn't be,
+                // and this fixes it for some case. More investigation is needed.
+
                 // Change the application so it calls the adapter rather than the
                 // passed function.
@@ -1760 +1774 @@
         /// Adds type parameters to the layout call; will generate the
         /// appropriate parameters if needed.
-        void addSTypeParamsToLayoutCall(
+        void addOTypeParamsToLayoutCall(
                 ast::UntypedExpr * layoutCall,
                 const ast::vector<ast::Type> & otypeParams );
@@ -2000 +2014 @@
                 ast::MemberExpr const * expr ) {
         // Only mutate member expressions for polymorphic types.
+        int typeDepth;
         ast::Type const * objectType = hasPolyBase(
-                expr->aggregate->result, scopeTypeVars
+                expr->aggregate->result, scopeTypeVars, &typeDepth
         );
         if ( !objectType ) return expr;
@@ -2079 +2094 @@
         }
         // MemberExpr was converted to pointer + offset; and it is not valid C to
-        // take the address of an addition, so strip away the address-of.
+        // take the address of an addition, so stript the address-of.
         // It also preserves the env value.
         return ast::mutate_field( expr->arg.get(), &ast::Expr::env, expr->env );
@@ -2280 +2295 @@
                                 } );
 
-                        addSTypeParamsToLayoutCall( layoutCall, sizedParams );
+                        addOTypeParamsToLayoutCall( layoutCall, sizedParams );
 
                         stmtsToAddBefore.emplace_back(
@@ -2321 +2336 @@
                         } );
 
-                addSTypeParamsToLayoutCall( layoutCall, sizedParams );
+                addOTypeParamsToLayoutCall( layoutCall, sizedParams );
 
                 stmtsToAddBefore.emplace_back(
@@ -2331 +2346 @@
 }
 
-void PolyGenericCalculator::addSTypeParamsToLayoutCall(
+void PolyGenericCalculator::addOTypeParamsToLayoutCall(
                 ast::UntypedExpr * layoutCall,
                 const ast::vector<ast::Type> & otypeParams ) {