Changes in src/SymTab/Validate.cc [09867ec:98538288]

File:

• src/SymTab/Validate.cc (modified) (14 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
@@ -271 +270 @@
         };
 
-        struct InitializerLength {
+        struct ArrayLength : public WithIndexer {
                 /// for array types without an explicit length, compute the length and store it so that it
                 /// is known to the rest of the phases. For example,
@@ -282 +281 @@
 
                 void previsit( ObjectDecl * objDecl );
-        };
-
-        struct ArrayLength : public WithIndexer {
-                static void computeLength( std::list< Declaration * > & translationUnit );
-
                 void previsit( ArrayType * arrayType );
         };
@@ -374 +368 @@
                                 mutateAll( translationUnit, compoundliteral );
                         });
-                        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::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");
-                        if (!useNewAST) {
-                                Stats::Time::TimeCall("Fix Object Type",
-                                        FixObjectType::fix, translationUnit);
-                        }
-                        Stats::Time::TimeCall("Initializer Length",
-                                InitializerLength::computeLength, translationUnit);
-                        if (!useNewAST) {
-                                Stats::Time::TimeCall("Array Length",
-                                        ArrayLength::computeLength, translationUnit);
-                        }
+                        Stats::Time::TimeCall("Fix Object Type",
+                                FixObjectType::fix, translationUnit);
+                        Stats::Time::TimeCall("Array Length",
+                                ArrayLength::computeLength, translationUnit);
                         Stats::Time::TimeCall("Find Special Declarations",
                                 Validate::findSpecialDecls, translationUnit);
                         Stats::Time::TimeCall("Fix Label Address",
                                 mutateAll<LabelAddressFixer>, translationUnit, labelAddrFixer);
-                        if (!useNewAST) {
-                                Stats::Time::TimeCall("Handle Attributes",
-                                        Validate::handleAttributes, translationUnit);
-                        }
+                        Stats::Time::TimeCall("Handle Attributes",
+                                Validate::handleAttributes, translationUnit);
                 }
         }
@@ -976 +960 @@
         }
 
-        static bool isNonParameterAttribute( Attribute * attr ) {
-                static const std::vector<std::string> bad_names = {
-                        "aligned", "__aligned__",
-                };
-                for ( auto name : bad_names ) {
-                        if ( name == attr->name ) {
-                                return true;
-                        }
-                }
-                return false;
-        }
-
         Type * ReplaceTypedef::postmutate( TypeInstType * typeInst ) {
                 // instances of typedef types will come here. If it is an instance
@@ -996 +968 @@
                         ret->location = typeInst->location;
                         ret->get_qualifiers() |= typeInst->get_qualifiers();
-                        // GCC ignores certain attributes if they arrive by typedef, this mimics that.
-                        if ( inFunctionType ) {
-                                ret->attributes.remove_if( isNonParameterAttribute );
-                        }
-                        ret->attributes.splice( ret->attributes.end(), typeInst->attributes );
+                        // attributes are not carried over from typedef to function parameters/return values
+                        if ( ! inFunctionType ) {
+                                ret->attributes.splice( ret->attributes.end(), typeInst->attributes );
+                        } else {
+                                deleteAll( ret->attributes );
+                                ret->attributes.clear();
+                        }
                         // place instance parameters on the typedef'd type
                         if ( ! typeInst->parameters.empty() ) {
@@ -1341 +1315 @@
         }
 
-        void InitializerLength::computeLength( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<InitializerLength> len;
-                acceptAll( translationUnit, len );
-        }
-
         void ArrayLength::computeLength( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<ArrayLength> len;
@@ -1351 +1320 @@
         }
 
-        void InitializerLength::previsit( ObjectDecl * objDecl ) {
+        void ArrayLength::previsit( ObjectDecl * objDecl ) {
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->type ) ) {
                         if ( at->dimension ) return;
@@ -1405 +1374 @@
         /// Replaces enum types by int, and function/array types in function parameter and return
         /// lists by appropriate pointers
-        /*
         struct EnumAndPointerDecay_new {
                 const ast::EnumDecl * previsit( const ast::EnumDecl * enumDecl ) {
@@ -1456 +1424 @@
                 }
         };
-        */
 
         /// expand assertions from a trait instance, performing appropriate type variable substitutions
@@ -1475 +1442 @@
         }
 
-        /*
-
         /// Associates forward declarations of aggregates with their definitions
         class LinkReferenceToTypes_new final
@@ -1543 +1508 @@
                 }
 
-                void checkGenericParameters( const ast::BaseInstType * inst ) {
+                void checkGenericParameters( const ast::ReferenceToType * inst ) {
                         for ( const ast::Expr * param : inst->params ) {
                                 if ( ! dynamic_cast< const ast::TypeExpr * >( param ) ) {
@@ -1807 +1772 @@
                 static const node_t * forallFixer(
                         const CodeLocation & loc, const node_t * node,
-                        ast::FunctionType::ForallList parent_t::* forallField
+                        ast::ParameterizedType::ForallList parent_t::* forallField
                 ) {
                         for ( unsigned i = 0; i < (node->* forallField).size(); ++i ) {
@@ -1858 +1823 @@
                 }
         };
-        */
 } // anonymous namespace
 
-/*
 const ast::Type * validateType(
                 const CodeLocation & loc, const ast::Type * type, const ast::SymbolTable & symtab ) {
-        // ast::Pass< EnumAndPointerDecay_new > epc;
+        ast::Pass< EnumAndPointerDecay_new > epc;
         ast::Pass< LinkReferenceToTypes_new > lrt{ loc, symtab };
         ast::Pass< ForallPointerDecay_new > fpd{ loc };
 
-        return type->accept( lrt )->accept( fpd );
+        return type->accept( epc )->accept( lrt )->accept( fpd );
 }
-*/
 
 } // namespace SymTab