Changes in src/main.cc [33b7d49:4ec9513]

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 : Fri Mar 11 10:39:00 2022
-// Update Count     : 671
+// Last Modified On : Wed Apr 13 11:11:00 2022
+// Update Count     : 672
 //
 
@@ -75 +75 @@
 #include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
 #include "Validate/Autogen.hpp"             // for autogenerateRoutines
+#include "Validate/GenericParameter.hpp"    // for fillGenericParameters, tr...
 #include "Validate/FindSpecialDecls.h"      // for findGlobalDecls
 #include "Validate/ForallPointerDecay.hpp"  // for decayForallPointers
@@ -80 +81 @@
 #include "Validate/InitializerLength.hpp"   // for setLengthFromInitializer
 #include "Validate/LabelAddressFixer.hpp"   // for fixLabelAddresses
+#include "Validate/ReturnCheck.hpp"         // for checkReturnStatements
 #include "Virtual/ExpandCasts.h"            // for expandCasts
 
@@ -327 +329 @@
                 PASS( "Validate-A", SymTab::validate_A( translationUnit ) );
                 PASS( "Validate-B", SymTab::validate_B( translationUnit ) );
-                PASS( "Validate-C", SymTab::validate_C( translationUnit ) );
 
                 CodeTools::fillLocations( translationUnit );
@@ -341 +342 @@
 
                         forceFillCodeLocations( 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 ) );
@@ -426 +438 @@
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        PASS( "Validate-C", SymTab::validate_C( translationUnit ) );
                         PASS( "Validate-D", SymTab::validate_D( translationUnit ) );
                         PASS( "Validate-E", SymTab::validate_E( translationUnit ) );