Changeset 800d275 for src/Concurrency/Keywords.cc

Timestamp:

Aug 29, 2017, 2:54:49 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

235b41f

Parents:

28e58fd (diff), 6454949 (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

File:

• src/Concurrency/Keywords.cc (modified) (19 diffs)

src/Concurrency/Keywords.cc

@@ -19 +19 @@
 #include <string>                  // for string, operator==
 
+#include "Common/PassVisitor.h"    // for PassVisitor
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for deleteAll, map_range
@@ -46 +47 @@
 
         //=============================================================================================
-        // Visitors declaration
+        // Pass declarations
         //=============================================================================================
 
@@ -58 +59 @@
         //                                           static inline NewField_t * getter_name( MyType * this ) { return &this->newField; }
         //
-        class ConcurrentSueKeyword : public Visitor {
-          protected:
-            template< typename Visitor >
-            friend void SymTab::acceptAndAdd( std::list< Declaration * > &translationUnit, Visitor &visitor );
+        class ConcurrentSueKeyword : public WithDeclsToAdd {
           public:
 
@@ -69 +67 @@
                 virtual ~ConcurrentSueKeyword() {}
 
-                using Visitor::visit;
-                virtual void visit( StructDecl * decl ) override final;
+                void postvisit( StructDecl * decl );
 
                 void handle( StructDecl * );
@@ -86 +83 @@
                 bool needs_main;
 
-                std::list< Declaration * > declsToAdd, declsToAddAfter;
                 StructDecl* type_decl = nullptr;
         };
@@ -117 +113 @@
 
                 static void implement( std::list< Declaration * > & translationUnit ) {
-                        ThreadKeyword impl;
-                        SymTab::acceptAndAdd( translationUnit, impl );
+                        PassVisitor< ThreadKeyword > impl;
+                        acceptAll( translationUnit, impl );
                 }
         };
@@ -148 +144 @@
 
                 static void implement( std::list< Declaration * > & translationUnit ) {
-                        CoroutineKeyword impl;
-                        SymTab::acceptAndAdd( translationUnit, impl );
+                        PassVisitor< CoroutineKeyword > impl;
+                        acceptAll( translationUnit, impl );
                 }
         };
@@ -179 +175 @@
 
                 static void implement( std::list< Declaration * > & translationUnit ) {
-                        MonitorKeyword impl;
-                        SymTab::acceptAndAdd( translationUnit, impl );
+                        PassVisitor< MonitorKeyword > impl;
+                        acceptAll( translationUnit, impl );
                 }
         };
@@ -192 +188 @@
         // }                                                               }
         //
-        class MutexKeyword final : public Visitor {
+        class MutexKeyword final {
           public:
 
-                using Visitor::visit;
-                virtual void visit( FunctionDecl * decl ) override final;
-                virtual void visit(   StructDecl * decl ) override final;
+                void postvisit( FunctionDecl * decl );
+                void postvisit(   StructDecl * decl );
 
                 std::list<DeclarationWithType*> findMutexArgs( FunctionDecl* );
                 void validate( DeclarationWithType * );
-                void addStatments( CompoundStmt *, const std::list<DeclarationWithType * > &);
+                void addStatments( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
 
                 static void implement( std::list< Declaration * > & translationUnit ) {
-                        MutexKeyword impl;
+                        PassVisitor< MutexKeyword > impl;
                         acceptAll( translationUnit, impl );
                 }
@@ -211 +206 @@
                 StructDecl* monitor_decl = nullptr;
                 StructDecl* guard_decl = nullptr;
+
+                static std::unique_ptr< Type > generic_func;
         };
+
+        std::unique_ptr< Type > MutexKeyword::generic_func = std::unique_ptr< Type >(
+                new FunctionType(
+                        noQualifiers,
+                        true
+                )
+        );
 
         //-----------------------------------------------------------------------------
@@ -221 +225 @@
         // }                                                               }
         //
-        class ThreadStarter final : public Visitor {
+        class ThreadStarter final {
           public:
 
-                using Visitor::visit;
-                virtual void visit( FunctionDecl * decl ) override final;
+                void postvisit( FunctionDecl * decl );
 
                 void addStartStatement( FunctionDecl * decl, DeclarationWithType * param );
 
                 static void implement( std::list< Declaration * > & translationUnit ) {
-                        ThreadStarter impl;
+                        PassVisitor< ThreadStarter > impl;
                         acceptAll( translationUnit, impl );
                 }
@@ -255 +258 @@
         // Generic keyword implementation
         //=============================================================================================
-        void ConcurrentSueKeyword::visit(StructDecl * decl) {
-                Visitor::visit(decl);
+        void ConcurrentSueKeyword::postvisit(StructDecl * decl) {
                 if( decl->get_name() == type_name && decl->has_body() ) {
                         assert( !type_decl );
@@ -344 +346 @@
                 }
 
-                declsToAdd.push_back( forward );
-                if( needs_main ) declsToAdd.push_back( main_decl );
-                declsToAdd.push_back( get_decl );
+                declsToAddBefore.push_back( forward );
+                if( needs_main ) declsToAddBefore.push_back( main_decl );
+                declsToAddBefore.push_back( get_decl );
 
                 return get_decl;
@@ -395 +397 @@
         // Mutex keyword implementation
         //=============================================================================================
-        void MutexKeyword::visit(FunctionDecl* decl) {
-                Visitor::visit(decl);
+
+        void MutexKeyword::postvisit(FunctionDecl* decl) {
 
                 std::list<DeclarationWithType*> mutexArgs = findMutexArgs( decl );
@@ -411 +413 @@
                 if( !guard_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl );
 
-                addStatments( body, mutexArgs );
-        }
-
-        void MutexKeyword::visit(StructDecl* decl) {
-                Visitor::visit(decl);
+                addStatments( decl, body, mutexArgs );
+        }
+
+        void MutexKeyword::postvisit(StructDecl* decl) {
 
                 if( decl->get_name() == "monitor_desc" ) {
@@ -458 +459 @@
         }
 
-        void MutexKeyword::addStatments( CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
+        void MutexKeyword::addStatments( FunctionDecl* func, CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
                 ObjectDecl * monitors = new ObjectDecl(
                         "__monitors",
@@ -489 +490 @@
                 );
 
+                assert(generic_func);
+
                 //in reverse order :
-                // monitor_guard_t __guard = { __monitors, # };
+                // monitor_guard_t __guard = { __monitors, #, func };
                 body->push_front(
                         new DeclStmt( noLabels, new ObjectDecl(
@@ -504 +507 @@
                                         {
                                                 new SingleInit( new VariableExpr( monitors ) ),
-                                                new SingleInit( new ConstantExpr( Constant::from_ulong( args.size() ) ) )
+                                                new SingleInit( new ConstantExpr( Constant::from_ulong( args.size() ) ) ),
+                                                new SingleInit( new CastExpr( new VariableExpr( func ), generic_func->clone() ) )
                                         },
                                         noDesignators,
@@ -519 +523 @@
         // General entry routine
         //=============================================================================================
-        void ThreadStarter::visit(FunctionDecl * decl) {
-                Visitor::visit(decl);
-
+        void ThreadStarter::postvisit(FunctionDecl * decl) {
                 if( ! CodeGen::isConstructor(decl->get_name()) ) return;