Changes in src/SymTab/Validate.cc [c884f2d:7e08acf]

File:

• src/SymTab/Validate.cc (modified) (2 diffs)

src/SymTab/Validate.cc

@@ -49 +49 @@
 #include "CodeGen/OperatorTable.h"     // for isCtorDtor, isCtorDtorAssign
 #include "ControlStruct/Mutate.h"      // for ForExprMutator
-#include "Common/Stats.h"              // for Stats::Heap
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
 #include "Common/ScopedMap.h"          // for ScopedMap
@@ -304 +303 @@
                 PassVisitor<FixQualifiedTypes> fixQual;
 
-                {
-                        Stats::Heap::newPass("validate-A");
-                        Stats::Time::BlockGuard guard("validate-A");
-                        acceptAll( translationUnit, hoistDecls );
-                        ReplaceTypedef::replaceTypedef( translationUnit );
-                        ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
-                        acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes because it is an indexer and needs correct types for mangling
-                }
-                {
-                        Stats::Heap::newPass("validate-B");
-                        Stats::Time::BlockGuard guard("validate-B");
-                        Stats::Time::TimeBlock("Link Reference To Types", [&]() {
-                                acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
-                        });
-                        Stats::Time::TimeBlock("Fix Qualified Types", [&]() {
-                                mutateAll( translationUnit, fixQual ); // must happen after LinkReferenceToTypes, because aggregate members are accessed
-                        });
-                        Stats::Time::TimeBlock("Hoist Structs", [&]() {
-                                HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
-                        });
-                        Stats::Time::TimeBlock("Eliminate Typedefs", [&]() {
-                                EliminateTypedef::eliminateTypedef( translationUnit ); //
-                        });
-                }
-                {
-                        Stats::Heap::newPass("validate-C");
-                        Stats::Time::BlockGuard guard("validate-C");
-                        acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes
-                        VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
-                        ReturnChecker::checkFunctionReturns( translationUnit );
-                        InitTweak::fixReturnStatements( translationUnit ); // must happen before autogen
-                }
-                {
-                        Stats::Heap::newPass("validate-D");
-                        Stats::Time::BlockGuard guard("validate-D");
-                        Stats::Time::TimeBlock("Apply Concurrent Keywords", [&]() {
-                                Concurrency::applyKeywords( translationUnit );
-                        });
-                        Stats::Time::TimeBlock("Forall Pointer Decay", [&]() {
-                                acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines, after Concurrency::applyKeywords because uniqueIds must be set on declaration before resolution
-                        });
-                        Stats::Time::TimeBlock("Hoist Control Declarations", [&]() {
-                                ControlStruct::hoistControlDecls( translationUnit );  // hoist initialization out of for statements; must happen before autogenerateRoutines
-                        });
-                        Stats::Time::TimeBlock("Generate Autogen routines", [&]() {
-                                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay
-                        });
-                }
-                {
-                        Stats::Heap::newPass("validate-E");
-                        Stats::Time::BlockGuard guard("validate-E");
-                        Stats::Time::TimeBlock("Implement Mutex Func", [&]() {
-                                Concurrency::implementMutexFuncs( translationUnit );
-                        });
-                        Stats::Time::TimeBlock("Implement Thread Start", [&]() {
-                                Concurrency::implementThreadStarter( translationUnit );
-                        });
-                        Stats::Time::TimeBlock("Compound Literal", [&]() {
-                                mutateAll( translationUnit, compoundliteral );
-                        });
-                        Stats::Time::TimeBlock("Resolve With Expressions", [&]() {
-                                ResolvExpr::resolveWithExprs( translationUnit ); // must happen before FixObjectType because user-code is resolved and may contain with variables
-                        });
-                }
-                {
-                        Stats::Heap::newPass("validate-F");
-                        Stats::Time::BlockGuard guard("validate-F");
-                        Stats::Time::TimeBlock("Fix Object Type", [&]() {
-                                FixObjectType::fix( translationUnit );
-                        });
-                        Stats::Time::TimeBlock("Array Length", [&]() {
-                                ArrayLength::computeLength( translationUnit );
-                        });
-                        Stats::Time::TimeBlock("Find Special Declarations", [&]() {
-                                acceptAll( translationUnit, finder ); // xxx - remove this pass soon
-                        });
-                        Stats::Time::TimeBlock("Fix Label Address", [&]() {
-                                mutateAll( translationUnit, labelAddrFixer );
-                        });
-                        Stats::Time::TimeBlock("Handle Attributes", [&]() {
-                                Validate::handleAttributes( translationUnit );
-                        });
-                }
+                acceptAll( translationUnit, hoistDecls );
+                ReplaceTypedef::replaceTypedef( translationUnit );
+                ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
+                acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes because it is an indexer and needs correct types for mangling
+                acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
+                mutateAll( translationUnit, fixQual ); // must happen after LinkReferenceToTypes, because aggregate members are accessed
+                HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
+                EliminateTypedef::eliminateTypedef( translationUnit ); //
+                acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes
+                VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
+                ReturnChecker::checkFunctionReturns( translationUnit );
+                InitTweak::fixReturnStatements( translationUnit ); // must happen before autogen
+                Concurrency::applyKeywords( translationUnit );
+                acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines, after Concurrency::applyKeywords because uniqueIds must be set on declaration before resolution
+                ControlStruct::hoistControlDecls( translationUnit );  // hoist initialization out of for statements; must happen before autogenerateRoutines
+                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay
+                Concurrency::implementMutexFuncs( translationUnit );
+                Concurrency::implementThreadStarter( translationUnit );
+                mutateAll( translationUnit, compoundliteral );
+                ResolvExpr::resolveWithExprs( translationUnit ); // must happen before FixObjectType because user-code is resolved and may contain with variables
+                FixObjectType::fix( translationUnit );
+                ArrayLength::computeLength( translationUnit );
+                acceptAll( translationUnit, finder ); // xxx - remove this pass soon
+                mutateAll( translationUnit, labelAddrFixer );
+                Validate::handleAttributes( translationUnit );
         }