Changeset 5dcb881 for src/SymTab

Timestamp:

Nov 12, 2021, 11:27:15 AM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

ce36b55

Parents:

3249dd8b

Message:

Split up the validate pass. (Some statistics code is repeated, but this does not effect regular runs.)

Location:

src/SymTab

Files:

• Validate.cc (modified) (8 diffs)
• Validate.h (modified) (1 diff)

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 13 23:43:34 2019
-// Update Count     : 363
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Nov 12 11:00:00 2021
+// Update Count     : 364
 //
 
@@ -334 +334 @@
         };
 
-        void validate( std::list< Declaration * > &translationUnit, __attribute__((unused)) bool doDebug ) {
+        void validate_A( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<EnumAndPointerDecay_old> epc;
-                PassVisitor<LinkReferenceToTypes_old> lrt( nullptr );
-                PassVisitor<ResolveEnumInitializers> rei( nullptr );
-                PassVisitor<ForallPointerDecay_old> fpd;
-                PassVisitor<CompoundLiteral> compoundliteral;
-                PassVisitor<ValidateGenericParameters> genericParams;
-                PassVisitor<LabelAddressFixer> labelAddrFixer;
                 PassVisitor<HoistTypeDecls> hoistDecls;
-                PassVisitor<FixQualifiedTypes> fixQual;
-
                 {
                         Stats::Heap::newPass("validate-A");
@@ -354 +346 @@
                         acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes_old because it is an indexer and needs correct types for mangling
                 }
+        }
+
+        void validate_B( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<LinkReferenceToTypes_old> lrt( nullptr );
+                PassVisitor<FixQualifiedTypes> fixQual;
                 {
                         Stats::Heap::newPass("validate-B");
@@ -362 +359 @@
                         EliminateTypedef::eliminateTypedef( translationUnit );
                 }
+        }
+
+        void validate_C( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<ValidateGenericParameters> genericParams;
+                PassVisitor<ResolveEnumInitializers> rei( nullptr );
                 {
                         Stats::Heap::newPass("validate-C");
@@ -381 +383 @@
                         });
                 }
+        }
+
+        void validate_D( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<ForallPointerDecay_old> fpd;
                 {
                         Stats::Heap::newPass("validate-D");
@@ -397 +403 @@
                         });
                 }
+        }
+
+        void validate_E( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<CompoundLiteral> compoundliteral;
                 {
                         Stats::Heap::newPass("validate-E");
@@ -415 +425 @@
                         }
                 }
+        }
+
+        void validate_F( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<LabelAddressFixer> labelAddrFixer;
                 {
                         Stats::Heap::newPass("validate-F");
@@ -437 +451 @@
                         }
                 }
+        }
+
+        void validate( std::list< Declaration * > &translationUnit, __attribute__((unused)) bool doDebug ) {
+                validate_A( translationUnit );
+                validate_B( translationUnit );
+                validate_C( translationUnit );
+                validate_D( translationUnit );
+                validate_E( translationUnit );
+                validate_F( translationUnit );
         }
 

src/SymTab/Validate.h

@@ -35 +35 @@
         void validateType( Type *type, const Indexer *indexer );
 
+        // Sub-passes of validate.
+        void validate_A( std::list< Declaration * > &translationUnit );
+        void validate_B( std::list< Declaration * > &translationUnit );
+        void validate_C( std::list< Declaration * > &translationUnit );
+        void validate_D( std::list< Declaration * > &translationUnit );
+        void validate_E( std::list< Declaration * > &translationUnit );
+        void validate_F( std::list< Declaration * > &translationUnit );
+
         const ast::Type * validateType(
                 const CodeLocation & loc, const ast::Type * type, const ast::SymbolTable & symtab );