Changeset 054514d for src/Concurrency/Keywords.cc

Timestamp:

May 29, 2018, 3:26:31 PM (6 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, with_gc

Children:

3530f39a

Parents:

96812c0 (diff), da60c631 (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) (3 diffs)

src/Concurrency/Keywords.cc

@@ -191 +191 @@
                 void postvisit(   StructDecl * decl );
 
-                std::list<DeclarationWithType*> findMutexArgs( FunctionDecl* );
+                std::list<DeclarationWithType*> findMutexArgs( FunctionDecl*, bool & first );
                 void validate( DeclarationWithType * );
                 void addDtorStatments( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
@@ -441 +441 @@
         void MutexKeyword::postvisit(FunctionDecl* decl) {
 
-                std::list<DeclarationWithType*> mutexArgs = findMutexArgs( decl );
+                bool first = false;
+                std::list<DeclarationWithType*> mutexArgs = findMutexArgs( decl, first );
                 if( mutexArgs.empty() ) return;
 
-                if( CodeGen::isConstructor(decl->name) ) SemanticError( decl, "constructors cannot have mutex parameters" );
+                if( CodeGen::isConstructor(decl->name) && first ) SemanticError( decl, "constructors cannot have mutex parameters" );
 
                 bool isDtor = CodeGen::isDestructor( decl->name );
@@ -484 +485 @@
         }
 
-        std::list<DeclarationWithType*> MutexKeyword::findMutexArgs( FunctionDecl* decl ) {
+        std::list<DeclarationWithType*> MutexKeyword::findMutexArgs( FunctionDecl* decl, bool & first ) {
                 std::list<DeclarationWithType*> mutexArgs;
 
+                bool once = true;
                 for( auto arg : decl->get_functionType()->get_parameters()) {
                         //Find mutex arguments
                         Type* ty = arg->get_type();
                         if( ! ty->get_mutex() ) continue;
+
+                        if(once) {first = true;}
+                        once = false;
 
                         //Append it to the list