Changeset def751f for src/main.cc

Timestamp:

Jul 25, 2022, 3:17:25 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

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

Children:

b0d9ff7

Parents:

4e2befe3 (diff), ffec1bf (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' into qualifiedEnum

File:

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

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jul 12 12:02:00 2022
-// Update Count     : 675
+// Last Modified On : Mon Jul 18 11:08:00 2022
+// Update Count     : 676
 //
 
@@ -330 +330 @@
                 Stats::Time::StopBlock();
 
-                PASS( "Translate Exception Declarations", ControlStruct::translateExcept( translationUnit ) );
-                if ( exdeclp ) {
-                        dump( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                CodeTools::fillLocations( translationUnit );
-
                 if( useNewAST ) {
-                        CodeTools::fillLocations( translationUnit );
-
                         if (Stats::Counters::enabled) {
                                 ast::pass_visitor_stats.avg = Stats::Counters::build<Stats::Counters::AverageCounter<double>>("Average Depth - New");
@@ -349 +339 @@
                         forceFillCodeLocations( transUnit );
 
-                        // Must happen before auto-gen, or anything that examines ops.
+                        PASS( "Translate Exception Declarations", ControlStruct::translateExcept( transUnit ) );
+                        if ( exdeclp ) {
+                                dump( move( transUnit ) );
+                                return EXIT_SUCCESS;
+                        }
+
                         PASS( "Verify Ctor, Dtor & Assign", Validate::verifyCtorDtorAssign( transUnit ) );
-
                         PASS( "Hoist Type Decls", Validate::hoistTypeDecls( transUnit ) );
                         // Hoist Type Decls pulls some declarations out of contexts where
@@ -359 +353 @@
 
                         PASS( "Replace Typedefs", Validate::replaceTypedef( transUnit ) );
-
-                        // Must happen before auto-gen.
                         PASS( "Fix Return Types", Validate::fixReturnTypes( transUnit ) );
-
-                        // Must happen before Link Reference to Types, it needs correct
-                        // types for mangling.
                         PASS( "Enum and Pointer Decay", Validate::decayEnumsAndPointers( transUnit ) );
 
-                        // Must happen before auto-gen, because it uses the sized flag.
                         PASS( "Link Reference To Types", Validate::linkReferenceToTypes( transUnit ) );
 
-                        // Must happen after Link References To Types,
-                        // because aggregate members are accessed.
                         PASS( "Fix Qualified Types", Validate::fixQualifiedTypes( transUnit ) );
-
                         PASS( "Hoist Struct", Validate::hoistStruct( transUnit ) );
                         PASS( "Eliminate Typedef", Validate::eliminateTypedef( transUnit ) );
-
-                        // Check as early as possible. Can't happen before
-                        // LinkReferenceToType, observed failing when attempted
-                        // before eliminateTypedef
                         PASS( "Validate Generic Parameters", Validate::fillGenericParameters( transUnit ) );
-
                         PASS( "Translate Dimensions", Validate::translateDimensionParameters( transUnit ) );
                         PASS( "Check Function Returns", Validate::checkReturnStatements( transUnit ) );
-
-                        // Must happen before Autogen.
                         PASS( "Fix Return Statements", InitTweak::fixReturnStatements( transUnit ) );
-
                         PASS( "Implement Concurrent Keywords", Concurrency::implementKeywords( transUnit ) );
-
-                        // Must be after implement concurrent keywords; because uniqueIds
-                        //   must be set on declaration before resolution.
-                        // Must happen before autogen routines are added.
                         PASS( "Forall Pointer Decay", Validate::decayForallPointers( 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 ) );
 
@@ -470 +439 @@
                         PASS( "Translate Tries", ControlStruct::translateTries( transUnit ) );
                         PASS( "Gen Waitfor", Concurrency::generateWaitFor( transUnit ) );
+                        PASS( "Convert Specializations",  GenPoly::convertSpecializations( transUnit ) ); // needs to happen before tuple types are expanded
+
 
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        PASS( "Translate Exception Declarations", ControlStruct::translateExcept( translationUnit ) );
+                        if ( exdeclp ) {
+                                dump( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
                         // add the assignment statement after the initialization of a type parameter
                         PASS( "Validate", SymTab::validate( translationUnit ) );
@@ -538 +515 @@
                         PASS( "Translate Tries", ControlStruct::translateTries( translationUnit ) );
                         PASS( "Gen Waitfor", Concurrency::generateWaitFor( translationUnit ) );
+                        PASS( "Convert Specializations",  GenPoly::convertSpecializations( translationUnit ) ); // needs to happen before tuple types are expanded
+
                 }
 
-                PASS( "Convert Specializations",  GenPoly::convertSpecializations( translationUnit ) ); // needs to happen before tuple types are expanded
+
+                // PASS( "Convert Specializations",  GenPoly::convertSpecializations( translationUnit ) ); // needs to happen before tuple types are expanded
 
                 PASS( "Expand Tuples", Tuples::expandTuples( translationUnit ) ); // xxx - is this the right place for this?