Changeset f5a51db for src/main.cc

Timestamp:

Feb 8, 2022, 11:53:13 AM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

cc7bbe6

Parents:

97c215f (diff), 1cf8a9f (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) (8 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Nov 30 10:25:00 2021
-// Update Count     : 659
+// Last Modified On : Wed Jan 26 14:09:00 2022
+// Update Count     : 670
 //
 
@@ -55 +55 @@
 #include "ControlStruct/ExceptTranslate.h"  // for translateEHM
 #include "ControlStruct/FixLabels.hpp"      // for fixLabels
+#include "ControlStruct/HoistControlDecls.hpp" //  hoistControlDecls
 #include "ControlStruct/Mutate.h"           // for mutate
 #include "GenPoly/Box.h"                    // for box
@@ -73 +74 @@
 #include "SynTree/Visitor.h"                // for acceptAll
 #include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
+#include "Validate/Autogen.hpp"             // for autogenerateRoutines
 #include "Validate/FindSpecialDecls.h"      // for findGlobalDecls
 #include "Validate/CompoundLiteral.hpp"     // for handleCompoundLiterals
@@ -78 +80 @@
 #include "Validate/LabelAddressFixer.hpp"   // for fixLabelAddresses
 #include "Virtual/ExpandCasts.h"            // for expandCasts
-
 
 static void NewPass( const char * const name ) {
@@ -326 +327 @@
                 PASS( "Validate-B", SymTab::validate_B( translationUnit ) );
                 PASS( "Validate-C", SymTab::validate_C( translationUnit ) );
-                PASS( "Validate-D", SymTab::validate_D( translationUnit ) );
 
                 CodeTools::fillLocations( translationUnit );
 
                 if( useNewAST ) {
+                        PASS( "Apply Concurrent Keywords", Concurrency::applyKeywords( translationUnit ) );
+                        PASS( "Forall Pointer Decay", SymTab::decayForallPointers( translationUnit ) );
+                        CodeTools::fillLocations( translationUnit );
+
                         if (Stats::Counters::enabled) {
                                 ast::pass_visitor_stats.avg = Stats::Counters::build<Stats::Counters::AverageCounter<double>>("Average Depth - New");
@@ -338 +342 @@
 
                         forceFillCodeLocations( transUnit );
+
+                        // Must happen before autogen routines are added.
+                        PASS( "Hoist Control Declarations", ControlStruct::hoistControlDecls( transUnit ) );
+
+                        // Must be after enum and pointer decay.
+                        // Must be before compound literals.
+                        PASS( "Generate Autogen Routines", Validate::autogenerateRoutines( transUnit ) );
 
                         PASS( "Implement Mutex", Concurrency::implementMutex( transUnit ) );
@@ -404 +415 @@
                         // Currently not working due to unresolved issues with UniqueExpr
                         PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( transUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
+
+                        PASS( "Translate Tries" , ControlStruct::translateTries( transUnit ) );
+
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        PASS( "Validate-D", SymTab::validate_D( translationUnit ) );
                         PASS( "Validate-E", SymTab::validate_E( translationUnit ) );
                         PASS( "Validate-F", SymTab::validate_F( translationUnit ) );
@@ -469 +484 @@
 
                         PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
+
+                        PASS( "Translate Tries" , ControlStruct::translateTries( translationUnit ) );
                 }
 
-                PASS( "Translate Tries" , ControlStruct::translateTries( translationUnit ) );
+                
 
                 PASS( "Gen Waitfor" , Concurrency::generateWaitFor( translationUnit ) );