Changeset 52a5262e for src/GenPoly

Timestamp:

Oct 16, 2023, 4:10:26 PM (16 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

d85141f

Parents:

e14d169

Message:

TypeVarMap? is now a subtype instead of an alias to remove the redundent constructor argument. Various bits of box pass clean-up.

Location:

src/GenPoly

Files:

• BoxNew.cpp (modified) (13 diffs)
• GenPoly.cc (modified) (2 diffs)
• GenPoly.h (modified) (1 diff)

src/GenPoly/BoxNew.cpp

@@ -39 +39 @@
 
 namespace {
-
-/// Common field of several sub-passes of box.
-struct BoxPass {
-        TypeVarMap scopeTypeVars;
-        BoxPass() : scopeTypeVars( ast::TypeData() ) {}
-};
 
 // TODO: Could this be a common helper somewhere?
@@ -359 +353 @@
 /// * Adds appropriate type variables to the function calls.
 struct CallAdapter final :
-                public BoxPass,
                 public ast::WithConstTypeSubstitution,
                 public ast::WithGuards,
@@ -438 +431 @@
                 CodeLocation const & location, ast::Type const * type );
 
-        /// Set of adapter functions in the current scope.
+        TypeVarMap scopeTypeVars;
         ScopedMap< std::string, ast::DeclWithType const * > adapters;
         std::map< ast::ApplicationExpr const *, ast::Expr const * > retVals;
@@ -659 +652 @@
         ptrdiff_t initArgCount = mutExpr->args.size();
 
-        TypeVarMap exprTypeVars = { ast::TypeData() };
+        TypeVarMap exprTypeVars;
         // TODO: Should this take into account the variables already bound in
         // scopeTypeVars ([ex] remove them from exprTypeVars)?
@@ -1410 +1403 @@
 
 ast::FunctionDecl const * DeclAdapter::previsit( ast::FunctionDecl const * decl ) {
-        TypeVarMap localTypeVars = { ast::TypeData() };
+        TypeVarMap localTypeVars;
         makeTypeVarMap( decl, localTypeVars );
 
@@ -1558 +1551 @@
         assertf( it != adapters.end(), "Could not correct floating node." );
         return ast::mutate_field( expr, &ast::VariableExpr::var, it->second );
-
 }
 
@@ -1570 +1562 @@
 /// * Inserts dynamic calculation of polymorphic type layouts where needed.
 struct PolyGenericCalculator final :
-                public BoxPass,
                 public ast::WithConstTypeSubstitution,
                 public ast::WithDeclsToAdd<>,
@@ -1615 +1606 @@
         /// C sizeof().
         ast::Expr const * genSizeof( CodeLocation const &, ast::Type const * );
-
         /// Enters a new scope for type-variables,
         /// adding the type variables from the provided type.
         void beginTypeScope( ast::Type const * );
 
+        /// The type variables and polymorphic parameters currently in scope.
+        TypeVarMap scopeTypeVars;
         /// Set of generic type layouts known in the current scope,
         /// indexed by sizeofName.
@@ -1668 +1660 @@
                 ast::TypeDecl const * decl ) {
         ast::Type const * base = decl->base;
-        if ( nullptr == base) return decl;
+        if ( nullptr == base ) return decl;
 
         // Add size/align variables for opaque type declarations.
@@ -1693 +1685 @@
         alignDecl->accept( *visitor );
 
-        // Can't use [makeVar], because it inserts into stmtsToAdd and TypeDecls
-        // can occur at global scope.
+        // A little trick to replace this with two declarations.
+        // Adding after makes sure that there is no conflict with adding stmts.
         declsToAddAfter.push_back( alignDecl );
-        // replace with sizeDecl.
         return sizeDecl;
 }
@@ -1721 +1712 @@
 
         // Change initialization of a polymorphic value object to allocate via a
-        // variable-length-array (alloca was previouly used, but it cannot be
-        // safely used in loops).
+        // variable-length-array (alloca cannot be safely used in loops).
         ast::ObjectDecl * newBuf = new ast::ObjectDecl( decl->location,
                 bufNamer.newName(),
@@ -2210 +2200 @@
 /// * Strips fields from generic structure declarations.
 struct Eraser final :
-                public BoxPass,
                 public ast::WithGuards {
         void guardTypeVarMap( ast::Type const * type ) {
@@ -2225 +2214 @@
         void previsit( ast::PointerType const * type );
         void previsit( ast::FunctionType const * type );
+public:
+        TypeVarMap scopeTypeVars;
 };
 

src/GenPoly/GenPoly.cc

@@ -273 +273 @@
         if ( func->returns.empty() ) return nullptr;
 
-        TypeVarMap forallTypes = { ast::TypeData() };
+        TypeVarMap forallTypes;
         makeTypeVarMap( func, forallTypes );
         return isDynType( func->returns.front(), forallTypes );
@@ -801 +801 @@
         const ast::FunctionType * function = getFunctionType( expr->func->result );
         assertf( function, "ApplicationExpr has non-function type: %s", toString( expr->func->result ).c_str() );
-        TypeVarMap exprTyVars = { ast::TypeData() };
+        TypeVarMap exprTyVars;
         makeTypeVarMap( function, exprTyVars );
         return needsBoxing( param, arg, exprTyVars, subst );

src/GenPoly/GenPoly.h

@@ -33 +33 @@
 
         typedef ErasableScopedMap< std::string, TypeDecl::Data > TyVarMap;
-        using TypeVarMap = ErasableScopedMap< ast::TypeEnvKey, ast::TypeData >;
+        struct TypeVarMap : public ErasableScopedMap<ast::TypeEnvKey, ast::TypeData> {
+                TypeVarMap() : ErasableScopedMap( ast::TypeData() ) {}
+        };
 
         /// Replaces a TypeInstType by its referrent in the environment, if applicable