Changes in src/main.cc [11df881:9e23b446]

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 : Mon Jul 18 11:08:00 2022
-// Update Count     : 676
+// Last Modified On : Tue Jun  7 13:29:00 2022
+// Update Count     : 674
 //
 
@@ -78 +78 @@
 #include "Validate/CompoundLiteral.hpp"     // for handleCompoundLiterals
 #include "Validate/EliminateTypedef.hpp"    // for eliminateTypedef
-#include "Validate/EnumAndPointerDecay.hpp" // for decayEnumsAndPointers
 #include "Validate/FindSpecialDecls.h"      // for findGlobalDecls
 #include "Validate/FixQualifiedTypes.hpp"   // for fixQualifiedTypes
-#include "Validate/FixReturnTypes.hpp"      // for fixReturnTypes
 #include "Validate/ForallPointerDecay.hpp"  // for decayForallPointers
 #include "Validate/GenericParameter.hpp"    // for fillGenericParameters, tr...
 #include "Validate/HoistStruct.hpp"         // for hoistStruct
-#include "Validate/HoistTypeDecls.hpp"      // for hoistTypeDecls
 #include "Validate/InitializerLength.hpp"   // for setLengthFromInitializer
 #include "Validate/LabelAddressFixer.hpp"   // for fixLabelAddresses
-#include "Validate/LinkReferenceToTypes.hpp" // for linkReferenceToTypes
-#include "Validate/ReplaceTypedef.hpp"      // for replaceTypedef
 #include "Validate/ReturnCheck.hpp"         // for checkReturnStatements
-#include "Validate/VerifyCtorDtorAssign.hpp" // for verifyCtorDtorAssign
 #include "Virtual/ExpandCasts.h"            // for expandCasts
 
@@ -330 +324 @@
                 Stats::Time::StopBlock();
 
+                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-A", SymTab::validate_A( translationUnit ) );
+
+                // Must happen before auto-gen, because it uses the sized flag.
+                PASS( "Link Reference To Types", SymTab::linkReferenceToTypes( translationUnit ) );
+
+                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");
@@ -339 +349 @@
                         forceFillCodeLocations( transUnit );
 
-                        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
-                        // locations are not tracked. Perhaps they should be, but for now
-                        // the full fill solves it.
-                        forceFillCodeLocations( transUnit );
-
-                        PASS( "Replace Typedefs", Validate::replaceTypedef( transUnit ) );
-                        PASS( "Fix Return Types", Validate::fixReturnTypes( transUnit ) );
-                        PASS( "Enum and Pointer Decay", Validate::decayEnumsAndPointers( transUnit ) );
-
-                        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 ) );
 
@@ -439 +449 @@
                         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 ) );
+                        PASS( "Validate-B", SymTab::validate_B( translationUnit ) );
+                        PASS( "Validate-C", SymTab::validate_C( translationUnit ) );
+                        PASS( "Validate-D", SymTab::validate_D( translationUnit ) );
+                        PASS( "Validate-E", SymTab::validate_E( translationUnit ) );
+                        PASS( "Validate-F", SymTab::validate_F( translationUnit ) );
 
                         if ( symtabp ) {
@@ -513 +522 @@
                         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?