Changes in src/SymTab/Validate.cc [954c954:3ff4c1e]

File:

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

src/SymTab/Validate.cc

@@ -64 +64 @@
 #include "Common/UniqueName.h"         // for UniqueName
 #include "Common/utility.h"            // for operator+, cloneAll, deleteAll
+#include "CompilationState.h"          // skip some passes in new-ast build
 #include "Concurrency/Keywords.h"      // for applyKeywords
 #include "FixFunction.h"               // for FixFunction
@@ -368 +369 @@
                                 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
-                        });
+                        if (!useNewAST) {
+                                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::TimeCall("Fix Object Type",
-                                FixObjectType::fix, translationUnit);
+                        if (!useNewAST) {
+                                Stats::Time::TimeCall("Fix Object Type",
+                                        FixObjectType::fix, translationUnit);
+                        }
                         Stats::Time::TimeCall("Array Length",
                                 ArrayLength::computeLength, translationUnit);
@@ -383 +388 @@
                         Stats::Time::TimeCall("Fix Label Address",
                                 mutateAll<LabelAddressFixer>, translationUnit, labelAddrFixer);
-                        Stats::Time::TimeCall("Handle Attributes",
-                                Validate::handleAttributes, translationUnit);
+                        if (!useNewAST) {
+                                Stats::Time::TimeCall("Handle Attributes",
+                                        Validate::handleAttributes, translationUnit);
+                        }
                 }
         }
@@ -1340 +1347 @@
 
         void ArrayLength::previsit( ArrayType * type ) {
-                if ( type->dimension ) {
-                        // need to resolve array dimensions early so that constructor code can correctly determine
-                        // if a type is a VLA (and hence whether its elements need to be constructed)
-                        ResolvExpr::findSingleExpression( type->dimension, Validate::SizeType->clone(), indexer );
-
-                        // must re-evaluate whether a type is a VLA, now that more information is available
-                        // (e.g. the dimension may have been an enumerator, which was unknown prior to this step)
-                        type->isVarLen = ! InitTweak::isConstExpr( type->dimension );
+                if (!useNewAST) {
+                        if ( type->dimension ) {
+                                // need to resolve array dimensions early so that constructor code can correctly determine
+                                // if a type is a VLA (and hence whether its elements need to be constructed)
+                                ResolvExpr::findSingleExpression( type->dimension, Validate::SizeType->clone(), indexer );
+
+                                // must re-evaluate whether a type is a VLA, now that more information is available
+                                // (e.g. the dimension may have been an enumerator, which was unknown prior to this step)
+                                type->isVarLen = ! InitTweak::isConstExpr( type->dimension );
+                        }
                 }
         }