Changeset 06bdba4 for src

Timestamp:

Jun 30, 2022, 11:33:20 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

25404c7

Parents:

fc2c57a9 (diff), adf03a6 (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

Files:

• AST/Decl.hpp (modified) (1 diff)
• AST/Inspect.cpp (modified) (2 diffs)
• AST/Inspect.hpp (modified) (2 diffs)
• SymTab/Validate.cc (modified) (1 diff)
• Validate/LinkReferenceToTypes.cpp (added)
• Validate/LinkReferenceToTypes.hpp (added)
• Validate/module.mk (modified) (1 diff)
• main.cc (modified) (3 diffs)

src/AST/Decl.hpp

@@ -316 +316 @@
         EnumDecl( const CodeLocation& loc, const std::string& name,
                 std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall, Type * base = nullptr,
-                 std::unordered_map< std::string, long long > enumValues = std::unordered_map< std::string, long long >() )
+                std::unordered_map< std::string, long long > enumValues = std::unordered_map< std::string, long long >() )
         : AggregateDecl( loc, name, std::move(attrs), linkage ), base(base), enumValues(enumValues) {}
 

src/AST/Inspect.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Node.hpp --
+// Inspect.cpp -- Helpers to get information from the AST.
 //
 // Author           : Thierry Delisle
 // Created On       : Fri Jun 24 13:16:31 2022
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun 27 15:35:00 2022
+// Update Count     : 1
 //
 
@@ -21 +21 @@
 
 namespace ast {
-        bool structHasFlexibleArray( const ast::StructDecl * decl ) {
-                if(decl->members.size() == 0) return false;
-                const auto & last = *decl->members.rbegin();
-                auto lastd = last.as<ast::DeclWithType>();
-                if(!lastd) return false; // I don't know what this is possible, but it might be.
-                auto atype = dynamic_cast<const ast::ArrayType *>(lastd->get_type());
-                if(!atype) return false;
-                return !atype->isVarLen && !atype->dimension;
-        }
-};
+
+bool structHasFlexibleArray( const ast::StructDecl * decl ) {
+        if(decl->members.size() == 0) return false;
+        const auto & last = *decl->members.rbegin();
+        auto lastd = last.as<ast::DeclWithType>();
+        // I don't know what this is possible, but it might be.
+        if(!lastd) return false;
+        auto atype = dynamic_cast<const ast::ArrayType *>(lastd->get_type());
+        if(!atype) return false;
+        return !atype->isVarLen && !atype->dimension;
+}
+
+} // namespace ast

src/AST/Inspect.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Node.hpp --
+// Inspect.hpp -- Helpers to get information from the AST.
 //
 // Author           : Thierry Delisle
 // Created On       : Fri Jun 24 13:16:31 2022
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun 27 15:35:00 2022
+// Update Count     : 1
 //
 
@@ -17 +17 @@
 
 namespace ast {
-        bool structHasFlexibleArray( const ast::StructDecl * );
+
+// Does the structure end in a flexable array declaration?
+bool structHasFlexibleArray( const ast::StructDecl * );
+
 }

src/SymTab/Validate.cc

@@ -312 +312 @@
                         Stats::Heap::newPass("validate-B");
                         Stats::Time::BlockGuard guard("validate-B");
-                        //linkReferenceToTypes( translationUnit );
+                        linkReferenceToTypes( translationUnit ); // Must happen before auto-gen, because it uses the sized flag.
                         mutateAll( translationUnit, fixQual ); // must happen after LinkReferenceToTypes_old, because aggregate members are accessed
                         HoistStruct::hoistStruct( translationUnit );

src/Validate/module.mk

@@ -41 +41 @@
         Validate/LabelAddressFixer.cpp \
         Validate/LabelAddressFixer.hpp \
+        Validate/LinkReferenceToTypes.cpp \
+        Validate/LinkReferenceToTypes.hpp \
         Validate/NoIdSymbolTable.hpp \
         Validate/ReturnCheck.cpp \

src/main.cc

@@ -85 +85 @@
 #include "Validate/InitializerLength.hpp"   // for setLengthFromInitializer
 #include "Validate/LabelAddressFixer.hpp"   // for fixLabelAddresses
+#include "Validate/LinkReferenceToTypes.hpp" // for linkReferenceToTypes
 #include "Validate/ReturnCheck.hpp"         // for checkReturnStatements
 #include "Virtual/ExpandCasts.h"            // for expandCasts
@@ -333 +334 @@
                 PASS( "Validate-A", SymTab::validate_A( translationUnit ) );
 
-                // Must happen before auto-gen, because it uses the sized flag.
-                PASS( "Link Reference To Types", SymTab::linkReferenceToTypes( translationUnit ) );
-
                 CodeTools::fillLocations( translationUnit );
 
@@ -348 +346 @@
 
                         forceFillCodeLocations( transUnit );
+
+                        // Must happen before auto-gen, because it uses the sized flag.
+                        PASS( "Link Reference To Types", Validate::linkReferenceToTypes( transUnit ) );
 
                         // Must happen after Link References To Types,