Index: src/GenPoly/BoxNew.cpp =================================================================== --- src/GenPoly/BoxNew.cpp (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) +++ src/GenPoly/BoxNew.cpp (revision 61e5d998091dfd12ea60e1fee02afb30670df0f3) @@ -386,16 +386,8 @@ // return value. - /// Pass the extra type parameters from polymorphic generic arguments or - /// return types into a function application. - ast::vector::iterator passArgTypeVars( - ast::ApplicationExpr * expr, ast::Type const * parmType, - ast::Type const * argBaseType, ast::vector::iterator arg, - const TypeVarMap & exprTyVars, std::set & seenTypes ); - /// Passes extra type parameters into a polymorphic function application. + /// Passes extra layout arguments for sized polymorphic type parameters. ast::vector::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,5 +692,5 @@ // the concrete type's parameters, not the formal type's). ast::vector::iterator argIt = - passTypeVars( mutExpr, concRetType, function, exprTypeVars ); + passTypeVars( mutExpr, function ); addInferredParams( mutExpr, argIt, function, exprTypeVars ); @@ -812,54 +804,7 @@ } -// arg is an in/out parameter that matches the return value. -ast::vector::iterator CallAdapter::passArgTypeVars( - ast::ApplicationExpr * expr, ast::Type const * paramType, - ast::Type const * argBaseType, ast::vector::iterator arg, - const TypeVarMap & exprTypeVars, std::set & seenTypes ) { - ast::Type const * polyType = isPolyType( paramType, exprTypeVars ); - if ( !polyType || dynamic_cast( 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( polyType ) ) { - auto argBaseStructType = - dynamic_cast( 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::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::iterator arg = expr->args.begin(); @@ -880,46 +825,4 @@ 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::const_iterator funcArg; - // Names for generic types we've seen. - std::set 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::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,11 +1426,4 @@ } -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,36 +1480,7 @@ mutDecl->assertions.clear(); - // Add size/align for generic parameter types to parameter list. - std::set seenTypes; - ast::vector otypeParams; - for ( ast::ptr & funcParam : mutDecl->params ) { - ast::Type const * polyType = isPolyType( funcParam->get_type(), localTypeVars ); - if ( !polyType || dynamic_cast( 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( 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,13 +1682,4 @@ beginGenericScope(); beginTypeScope( decl->type ); - - // TODO: Going though dec->params does not work for some reason. - for ( ast::ptr 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( polyType ) ) { - knownLayouts.insert( Mangle::mangleType( polyType ) ); - } - } } @@ -1898,14 +1756,4 @@ // 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 const & funcParam : type->params ) { - // Condition here duplicates that in `DeclAdapter::previsit( FunctionDecl const * )` - ast::Type const * polyType = isPolyType( funcParam, scopeTypeVars ); - if ( polyType && !dynamic_cast( polyType ) ) { - knownLayouts.insert( Mangle::mangleType( polyType ) ); - } - } }