Changeset 61e5d99

Timestamp:

Oct 16, 2023, 10:24:14 AM (7 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

c298079

Parents:

a97b9ed

Message:

Boxing no longer passes layout information about polymorphic types in the signature of the function. This simplifies the sub-passes in the box pass that added the arguments to the calls, the parameters to the declarations, and used the information internally. The effects in functions are less well quantified, because there are cases were the information has to be generated instead of passed in, but it is also never passed in (or generated) when not needed at all.

File:

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

src/GenPoly/BoxNew.cpp

@@ -386 +386 @@
         // return value.
 
-        /// Pass the extra type parameters from polymorphic generic arguments or
-        /// return types into a function application.
-        ast::vector<ast::Expr>::iterator passArgTypeVars(
-                ast::ApplicationExpr * expr, ast::Type const * parmType,
-                ast::Type const * argBaseType, ast::vector<ast::Expr>::iterator arg,
-                const TypeVarMap & exprTyVars, std::set<std::string> & seenTypes );
-        /// Passes extra type parameters into a polymorphic function application.
+        /// Passes extra layout arguments for sized polymorphic type parameters.
         ast::vector<ast::Expr>::iterator passTypeVars(
                 ast::ApplicationExpr * expr,
-                ast::Type const * polyRetType,
-                ast::FunctionType const * funcType,
-                const TypeVarMap & exprTyVars );
+                ast::FunctionType const * funcType );
         /// Wraps a function application with a new temporary for the
         /// out-parameter return value.
@@ -700 +692 @@
         // the concrete type's parameters, not the formal type's).
         ast::vector<ast::Expr>::iterator argIt =
-                passTypeVars( mutExpr, concRetType, function, exprTypeVars );
+                passTypeVars( mutExpr, function );
         addInferredParams( mutExpr, argIt, function, exprTypeVars );
 
@@ -812 +804 @@
 }
 
-// arg is an in/out parameter that matches the return value.
-ast::vector<ast::Expr>::iterator CallAdapter::passArgTypeVars(
-                ast::ApplicationExpr * expr, ast::Type const * paramType,
-                ast::Type const * argBaseType, ast::vector<ast::Expr>::iterator arg,
-                const TypeVarMap & exprTypeVars, std::set<std::string> & seenTypes ) {
-        ast::Type const * polyType = isPolyType( paramType, exprTypeVars );
-        if ( !polyType || dynamic_cast<ast::TypeInstType const *>( polyType ) ) {
-                return arg;
-        }
-
-        std::string typeName = Mangle::mangleType( polyType );
-        if ( seenTypes.count( typeName ) ) return arg;
-
-        arg = expr->args.insert( arg,
-                new ast::SizeofExpr( expr->location, ast::deepCopy( argBaseType ) )
-        );
-        arg++;
-        arg = expr->args.insert( arg,
-                new ast::AlignofExpr( expr->location, ast::deepCopy( argBaseType ) )
-        );
-        arg++;
-        if ( dynamic_cast<ast::StructInstType const *>( polyType ) ) {
-                auto argBaseStructType =
-                                dynamic_cast<ast::StructInstType const *>( argBaseType );
-                if ( nullptr == argBaseStructType ) {
-                        SemanticError( expr,
-                                "Cannot pass non-structure type for generic struct: " );
-                }
-
-                // Zero-length arrays are forbidden by C, so don't pass
-                // offset for empty structure.
-                if ( !argBaseStructType->base->members.empty() ) {
-                        arg = expr->args.insert( arg,
-                                new ast::OffsetPackExpr(
-                                        expr->location,
-                                        ast::deepCopy( argBaseStructType ) )
-                        );
-                        arg++;
-                }
-        }
-
-        seenTypes.insert( typeName );
-        return arg;
-}
-
 ast::vector<ast::Expr>::iterator CallAdapter::passTypeVars(
                 ast::ApplicationExpr * expr,
-                ast::Type const * polyRetType,
-                ast::FunctionType const * function,
-                const TypeVarMap & exprTypeVars ) {
+                ast::FunctionType const * function ) {
         assert( typeSubs );
         ast::vector<ast::Expr>::iterator arg = expr->args.begin();
@@ -880 +825 @@
                         new ast::AlignofExpr( expr->location, ast::deepCopy( concrete ) ) );
                 arg++;
-        }
-
-        // Add size/align for generic types to parameter list.
-        if ( !expr->func->result ) return arg;
-        ast::FunctionType const * funcType = getFunctionType( expr->func->result );
-        assert( funcType );
-
-        // This iterator points at first original argument.
-        ast::vector<ast::Expr>::const_iterator funcArg;
-        // Names for generic types we've seen.
-        std::set<std::string> seenTypes;
-
-        // A polymorphic return type may need to be added to the argument list.
-        if ( polyRetType ) {
-                assert( typeSubs );
-                auto concRetType = replaceWithConcrete( polyRetType, *typeSubs );
-                // TODO: This write-back may not be correct.
-                arg = passArgTypeVars( expr, polyRetType, concRetType,
-                                arg, exprTypeVars, seenTypes );
-                // Skip the return parameter in the argument list.
-                funcArg = arg + 1;
-        } else {
-                funcArg = arg;
-        }
-
-        // TODO:
-        // I believe this is (starts as) the number of original arguments to the
-        // function with the args before funcArg all being inserted.
-        ptrdiff_t argsToPass = std::distance( funcArg, expr->args.cend() );
-
-        // Add type information args for presently unseen types in parameter list.
-        ast::vector<ast::Type>::const_iterator funcParam = funcType->params.begin();
-        // assert( funcType->params.size() == argsToPass );
-        for ( ; funcParam != funcType->params.end() && 0 < argsToPass
-                        ; ++funcParam, --argsToPass ) {
-                assert( 0 < argsToPass );
-                assert( argsToPass <= (ptrdiff_t)expr->args.size() );
-                ptrdiff_t index = expr->args.size() - argsToPass;
-                ast::Type const * argType = expr->args[index]->result;
-                if ( nullptr == argType ) continue;
-                arg = passArgTypeVars( expr, *funcParam, argType,
-                                arg, exprTypeVars, seenTypes );
         }
         return arg;
@@ -1523 +1426 @@
 }
 
-ast::ObjectDecl * makePtr(
-                CodeLocation const & location, std::string const & name ) {
-        return new ast::ObjectDecl( location, name,
-                new ast::PointerType( makeSizeAlignType() ),
-                nullptr, ast::Storage::Classes(), ast::Linkage::C, nullptr );
-}
-
 ast::FunctionDecl const * DeclAdapter::previsit( ast::FunctionDecl const * decl ) {
         TypeVarMap localTypeVars = { ast::TypeData() };
@@ -1584 +1480 @@
         mutDecl->assertions.clear();
 
-        // Add size/align for generic parameter types to parameter list.
-        std::set<std::string> seenTypes;
-        ast::vector<ast::DeclWithType> otypeParams;
-        for ( ast::ptr<ast::DeclWithType> & funcParam : mutDecl->params ) {
-                ast::Type const * polyType = isPolyType( funcParam->get_type(), localTypeVars );
-                if ( !polyType || dynamic_cast<ast::TypeInstType const *>( polyType ) ) {
-                        continue;
-                }
-                std::string typeName = Mangle::mangleType( polyType );
-                if ( seenTypes.count( typeName ) ) continue;
-                seenTypes.insert( typeName );
-
-                auto sizeParam = makeObj( funcParam->location, sizeofName( typeName ) );
-                otypeParams.emplace_back( sizeParam );
-
-                auto alignParam = makeObj( funcParam->location, alignofName( typeName ) );
-                otypeParams.emplace_back( alignParam );
-
-                // Zero-length arrays are illegal in C, so empty structs have no
-                // offset array.
-                if ( auto * polyStruct =
-                                dynamic_cast<ast::StructInstType const *>( polyType ) ;
-                                polyStruct && !polyStruct->base->members.empty() ) {
-                        auto offsetParam = makePtr( funcParam->location, offsetofName( typeName ) );
-                        otypeParams.emplace_back( offsetParam );
-                }
-        }
-
         // Prepend each argument group. From last group to first. addAdapters
         // does do the same, it just does it itself and see all other parameters.
         spliceBegin( mutDecl->params, inferredParams );
-        spliceBegin( mutDecl->params, otypeParams );
         spliceBegin( mutDecl->params, layoutParams );
         addAdapters( mutDecl, localTypeVars );
@@ -1815 +1682 @@
         beginGenericScope();
         beginTypeScope( decl->type );
-
-        // TODO: Going though dec->params does not work for some reason.
-        for ( ast::ptr<ast::Type> const & funcParam : decl->type->params ) {
-                // Condition here duplicates that in `DeclAdapter::previsit( FunctionDecl const * )`
-                ast::Type const * polyType = isPolyType( funcParam, scopeTypeVars );
-                if ( polyType && !dynamic_cast<ast::TypeInstType const *>( polyType ) ) {
-                        knownLayouts.insert( Mangle::mangleType( polyType ) );
-                }
-        }
 }
 
@@ -1898 +1756 @@
         // don't mark them as known in this scope.
         expect_func_type = false;
-
-        // Make sure that any type information passed into the function is
-        // accounted for.
-        for ( ast::ptr<ast::Type> const & funcParam : type->params ) {
-                // Condition here duplicates that in `DeclAdapter::previsit( FunctionDecl const * )`
-                ast::Type const * polyType = isPolyType( funcParam, scopeTypeVars );
-                if ( polyType && !dynamic_cast<ast::TypeInstType const *>( polyType ) ) {
-                        knownLayouts.insert( Mangle::mangleType( polyType ) );
-                }
-        }
 }