Changeset 8d182b1 for src/main.cc

Timestamp:

Nov 14, 2023, 12:19:09 PM (23 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

1ccae59, 89a8bab

Parents:

df8ba61a (diff), 5625427 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/main.cc (modified) (7 diffs)

src/main.cc

@@ -29 +29 @@
 #include <string>                           // for char_traits, operator<<
 
-#include "AST/Convert.hpp"
 #include "AST/Pass.hpp"                     // for pass_visitor_stats
 #include "AST/Print.hpp"                    // for printAll
@@ -40 +39 @@
 #include "CodeGen/Generate.h"               // for generate
 #include "CodeGen/LinkOnce.h"               // for translateLinkOnce
-#include "CodeTools/TrackLoc.h"             // for fillLocations
 #include "Common/CodeLocationTools.hpp"     // for forceFillCodeLocations
 #include "Common/DeclStats.hpp"             // for printDeclStats
@@ -66 +64 @@
 #include "ResolvExpr/EraseWith.hpp"         // for eraseWith
 #include "ResolvExpr/Resolver.h"            // for resolve
-#include "SynTree/LinkageSpec.h"            // for Spec, Cforall, Intrinsic
-#include "SynTree/Declaration.h"            // for Declaration
 #include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
 #include "Validate/Autogen.hpp"             // for autogenerateRoutines
@@ -101 +97 @@
                 ast::pass_visitor_stats.max = build<MaxCounter<double>>( "Max Depth", pass );
         }
-        {
-                static auto group = build<CounterGroup>( "Syntax Node" );
-                auto pass = build<CounterGroup>( name, group );
-                BaseSyntaxNode::new_nodes = build<SimpleCounter>( "Allocs", pass );
-        }
 }
 
@@ -259 +250 @@
 
         parse_cmdline( argc, argv );                                            // process command-line arguments
-        CodeGen::FixMain::setReplaceMain( !nomainp );
 
         if ( waiting_for_gdb ) {
@@ -403 +393 @@
                 PASS( "Translate Tries", ControlStruct::translateTries, transUnit );
                 PASS( "Gen Waitfor", Concurrency::generateWaitFor, transUnit );
+                PASS( "Fix Main Linkage", CodeGen::fixMainLinkage, transUnit, !nomainp );
 
                 // Needs to happen before tuple types are expanded.
@@ -430 +421 @@
 
                 PASS( "Code Gen", CodeGen::generate, transUnit, *output, !genproto, prettycodegenp, true, linemarks, false );
-
-                CodeGen::FixMain::fix( transUnit, *output, (PreludeDirector + "/bootloader.c").c_str() );
+                CodeGen::fixMainInvoke( transUnit, *output, (PreludeDirector + "/bootloader.c").c_str() );
+
                 if ( output != &cout ) {
                         delete output;