Changeset 29075d1 for src/Concurrency

Timestamp:

Nov 18, 2024, 10:07:39 PM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

7c80a86, ecf3812

Parents:

1b39705 (diff), ed96731 (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/Concurrency

Files:

• Actors.cpp (modified) (2 diffs)
• Corun.cpp (modified) (1 diff)
• Keywords.cpp (modified) (3 diffs)
• Waituntil.cpp (modified) (1 diff)

src/Concurrency/Actors.cpp

@@ -194 +194 @@
 // collects data needed for next pass that does the circular defn resolution
 //     for message send operators (via table above)
-struct GenFuncsCreateTables : public ast::WithDeclsToAdd<> {
+struct GenFuncsCreateTables : public ast::WithDeclsToAdd {
         unordered_set<const StructDecl *> & actorStructDecls;
         unordered_set<const StructDecl *>  & messageStructDecls;
@@ -451 +451 @@
 // separate pass is needed since this pass resolves circular defn issues
 // generates the forward declarations of the send operator for actor routines
-struct FwdDeclOperator : public ast::WithDeclsToAdd<> {
+struct FwdDeclOperator : public ast::WithDeclsToAdd {
         unordered_set<const StructDecl *> & actorStructDecls;
         unordered_set<const StructDecl *>  & messageStructDecls;

src/Concurrency/Corun.cpp

@@ -25 +25 @@
 namespace Concurrency {
 
-struct CorunKeyword : public WithDeclsToAdd<>, public WithStmtsToAdd<> {
+struct CorunKeyword : public WithDeclsToAdd, public WithStmtsToAdd {
         UniqueName CorunFnNamer = "__CFA_corun_lambda_"s;
         UniqueName CoforFnNamer = "__CFA_cofor_lambda_"s;

src/Concurrency/Keywords.cpp

@@ -117 +117 @@
 
 // --------------------------------------------------------------------------
-struct ConcurrentSueKeyword : public ast::WithDeclsToAdd<> {
+struct ConcurrentSueKeyword : public ast::WithDeclsToAdd {
         ConcurrentSueKeyword(
                 std::string&& type_name, std::string&& field_name,
@@ -639 +639 @@
 // --------------------------------------------------------------------------
 struct SuspendKeyword final :
-                public ast::WithStmtsToAdd<>, public ast::WithGuards {
+                public ast::WithStmtsToAdd, public ast::WithGuards {
         SuspendKeyword() = default;
         virtual ~SuspendKeyword() = default;
@@ -860 +860 @@
 
 // --------------------------------------------------------------------------
-struct MutexKeyword final : public ast::WithDeclsToAdd<> {
+struct MutexKeyword final : public ast::WithDeclsToAdd {
         const ast::FunctionDecl * postvisit( const ast::FunctionDecl * decl );
         void postvisit( const ast::StructDecl * decl );

src/Concurrency/Waituntil.cpp

@@ -1398 +1398 @@
 // To add the predicates at global scope we need to do it in a second pass
 // Predicates are added after "struct select_node { ... };"
-class AddPredicateDecls final : public WithDeclsToAdd<> {
+class AddPredicateDecls final : public WithDeclsToAdd {
         vector<FunctionDecl *> & satFns;
         const StructDecl * selectNodeDecl = nullptr;