Changeset 1cb758f2 for src/Concurrency

Timestamp:

Aug 27, 2017, 11:26:26 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, stuck-waitfor-destruct, with_gc

Children:

111a8af8, 26238c1, 7ee1e2f6

Parents:

0c6596f (diff), eca3d10a (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/Concurrency/Keywords.cc

@@ -201 +201 @@
                 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 ) {
@@ -211 +211 @@
                 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
+                )
+        );
 
         //-----------------------------------------------------------------------------
@@ -395 +404 @@
         // Mutex keyword implementation
         //=============================================================================================
+
         void MutexKeyword::visit(FunctionDecl* decl) {
                 Visitor::visit(decl);
@@ -411 +421 @@
                 if( !guard_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl );
 
-                addStatments( body, mutexArgs );
+                addStatments( decl, body, mutexArgs );
         }
 
@@ -458 +468 @@
         }
 
-        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 +499 @@
                 );
 
+                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 +516 @@
                                         {
                                                 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,