Changeset b82d140 for src/SymTab

Timestamp:

Nov 10, 2020, 12:44:44 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

080b0a1, 883c4d9, f33eab7

Parents:

82a2fed (diff), cdacb73 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/SymTab

Files:

• Autogen.cc (modified) (2 diffs)
• Autogen.h (modified) (1 diff)
• Validate.cc (modified) (4 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;
@@ -346 +347 @@
         void FuncGenerator::resolve( FunctionDecl * dcl ) {
                 try {
-                        ResolvExpr::resolveDecl( dcl, indexer );
+                        if (!useNewAST) // attempt to delay resolver call
+                                ResolvExpr::resolveDecl( dcl, indexer );
                         if ( functionNesting == 0 ) {
                                 // forward declare if top-level struct, so that

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
@@ -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 );
+                        }
                 }
         }