Changeset d3652df

Timestamp:

Oct 8, 2023, 10:31:26 AM (7 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

4817662

Parents:

be8ee65

Message:

Took the new EraseWith? pass out of the box pass. It might be able to go even earlier or folded into an existing pass. C code generation now will not generate WithStmt? nodes.

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (1 diff)
• GenPoly/BoxNew.cpp (modified) (2 diffs)
• ResolvExpr/EraseWith.cpp (added)
• ResolvExpr/EraseWith.hpp (added)
• ResolvExpr/module.mk (modified) (1 diff)
• main.cc (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -1157 +1157 @@
 
         void CodeGenerator::postvisit( WithStmt * with ) {
-                if ( ! options.genC ) {
-                        output << "with ( ";
-                        genCommaList( with->exprs.begin(), with->exprs.end() );
-                        output << " ) ";
-                }
+                assertf( ! options.genC, "WithStmts should not reach code generation." );
+
+                output << "with ( ";
+                genCommaList( with->exprs.begin(), with->exprs.end() );
+                output << " ) ";
                 with->stmt->accept( *visitor );
         }

src/GenPoly/BoxNew.cpp

@@ -1726 +1726 @@
 
 // --------------------------------------------------------------------------
-// TODO: This is kind of a blind test. I believe all withExprs are handled
-// in the resolver and we could clear them out after that.
-struct RemoveWithExprs final {
-        ast::FunctionDecl const * postvisit( ast::FunctionDecl const * decl ) {
-                if ( decl->withExprs.empty() ) return decl;
-                auto mutDecl = mutate( decl );
-                mutDecl->withExprs.clear();
-                return mutDecl;
-        }
-};
-
-// --------------------------------------------------------------------------
 /// Inserts code to access polymorphic layout inforation.
 /// * Replaces member and size/alignment/offsetof expressions on polymorphic
@@ -2511 +2499 @@
         ast::Pass<DeclAdapter>::run( translationUnit );
         ast::Pass<RewireAdapters>::run( translationUnit );
-        ast::Pass<RemoveWithExprs>::run( translationUnit );
         ast::Pass<PolyGenericCalculator>::run( translationUnit );
         ast::Pass<Eraser>::run( translationUnit );

src/ResolvExpr/module.mk

@@ -72 +72 @@
         ResolvExpr/AlternativePrinter.h \
         ResolvExpr/CandidatePrinter.cpp \
-        ResolvExpr/CandidatePrinter.hpp
+        ResolvExpr/CandidatePrinter.hpp \
+        ResolvExpr/EraseWith.cpp \
+        ResolvExpr/EraseWith.hpp
 
 SRCDEMANGLE += $(SRC_RESOLVEXPR)

src/main.cc

@@ -62 +62 @@
 #include "Parser/RunParser.hpp"             // for buildList, dumpParseTree,...
 #include "ResolvExpr/CandidatePrinter.hpp"  // for printCandidates
+#include "ResolvExpr/EraseWith.hpp"         // for eraseWith
 #include "ResolvExpr/Resolver.h"            // for resolve
 #include "SynTree/LinkageSpec.h"            // for Spec, Cforall, Intrinsic
@@ -396 +397 @@
 
                 PASS( "Fix Init", InitTweak::fix, transUnit, buildingLibrary() );
+                PASS( "Erase With", ResolvExpr::eraseWith, transUnit );
 
                 // fix ObjectDecl - replaces ConstructorInit nodes