Changeset 3c4003b9

Timestamp:

Nov 24, 2023, 10:14:27 AM (13 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

f48dfcd

Parents:

53dac82

Message:

Box pass Eraser now removes the polymorphic arguments now that the functions are no longer actually polymorphic.

Location:

src

Files:

• CodeGen/CodeGeneratorNew.cpp (modified) (1 diff)
• GenPoly/BoxNew.cpp (modified) (4 diffs)

src/CodeGen/CodeGeneratorNew.cpp

@@ -171 +171 @@
         // Add the forall clause.
         // TODO: These probably should be removed by now and the assert used.
-        if ( !decl->type_params.empty() && !options.genC ) {
-                //assertf( !options.genC, "FunctionDecl::forall should not reach code generation." );
+        if ( !decl->type_params.empty() ) {
+                assertf( !options.genC, "FunctionDecl forall should not reach code generation." );
                 acc << "forall(";
                 subCG.core.genCommaList( decl->type_params );

src/GenPoly/BoxNew.cpp

@@ -16 +16 @@
 #include "Box.h"
 
+#include "AST/Chain.hpp"               // for chain_mutate
 #include "AST/Decl.hpp"                // for Decl, FunctionDecl, ...
 #include "AST/Expr.hpp"                // for AlignofExpr, ConstantExpr, ...
@@ -1435 +1436 @@
         ast::FunctionType * type = new ast::FunctionType(
                 mutDecl->type->isVarArgs, mutDecl->type->qualifiers );
-        for ( auto type_param : mutDecl->type_params ) {
-                type->forall.emplace_back( new ast::TypeInstType( type_param ) );
-        }
         for ( auto param : mutDecl->params ) {
                 type->params.emplace_back( param->get_type() );
@@ -2190 +2188 @@
         ast::ObjectDecl const * previsit( ast::ObjectDecl const * decl );
         ast::FunctionDecl const * previsit( ast::FunctionDecl const * decl );
+        ast::FunctionDecl const * postvisit( ast::FunctionDecl const * decl );
         ast::TypedefDecl const * previsit( ast::TypedefDecl const * decl );
         ast::StructDecl const * previsit( ast::StructDecl const * decl );
@@ -2210 +2209 @@
 }
 
+ast::FunctionDecl const * Eraser::postvisit( ast::FunctionDecl const * decl ) {
+        if ( decl->type_params.empty() ) return decl;
+        auto mutDecl = mutate( decl );
+        mutDecl->type_params.clear();
+        ast::chain_mutate( mutDecl->type )->forall.clear();
+        return mutDecl;
+}
+
 ast::TypedefDecl const * Eraser::previsit( ast::TypedefDecl const * decl ) {
         guardTypeVarMap( decl->base );