Changeset 349b2cb for src/Concurrency/Keywords.cc

Timestamp:

Mar 22, 2017, 11:28:47 AM (7 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, with_gc

Children:

9c14ae9

Parents:

597db97 (diff), a53e10a (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) (1 diff)

src/Concurrency/Keywords.cc

@@ -331 +331 @@
                         ),
                         new ListInit(
-                                map_range < std::list<Initializer*> > ( args, [](DeclarationWithType * var ){
+                                map_range < std::list<Initializer*> > ( args, [this](DeclarationWithType * var ){
+                                        Type * type = var->get_type()->clone();
+                                        type->set_mutex( false );
                                         return new SingleInit( new UntypedExpr(
                                                 new NameExpr( "get_monitor" ),
-                                                {  new VariableExpr( var ) }
+                                                {  new CastExpr( new VariableExpr( var ), type ) }
                                         ) );
                                 })