Changeset 16ba4a6f for src/SymTab

Timestamp:

Nov 10, 2020, 12:20:37 AM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

18f0b70

Parents:

3febb2d

Message:

factor out resolver calls in pre-resolution stage

Location:

src/SymTab

Files:

• Autogen.cc (modified) (1 diff)
• Autogen.h (modified) (1 diff)
• Validate.cc (modified) (6 diffs)

src/SymTab/Autogen.cc

@@ -38 +38 @@
 #include "SynTree/Type.h"          // for FunctionType, Type, TypeInstType
 #include "SynTree/Visitor.h"       // for maybeAccept, Visitor, acceptAll
+#include "CompilationState.h"
 
 class Attribute;

src/SymTab/Autogen.h

@@ -167 +167 @@
                 fExpr->args.emplace_back( dstParam );
 
-                const ast::Stmt * listInit = srcParam.buildListInit( fExpr );
+                ast::ptr<ast::Stmt> listInit = srcParam.buildListInit( fExpr );
 
                 // fetch next set of arguments

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
@@ -281 +282 @@
 
                 void previsit( ObjectDecl * objDecl );
-                void previsit( ArrayType * arrayType );
+                // void previsit( ArrayType * arrayType );
         };
 
@@ -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);
+                        }
                 }
         }
@@ -1339 +1346 @@
         }
 
+        // xxx - this seems to be in HoistArrayDimension now.
+
+        /*
         void ArrayLength::previsit( ArrayType * type ) {
                 if ( type->dimension ) {
@@ -1350 +1360 @@
                 }
         }
+        */
 
         struct LabelFinder {