Changeset 90152a4 for src/Concurrency/Waitfor.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

• src/Concurrency/Waitfor.cc (modified) (2 diffs)

src/Concurrency/Waitfor.cc

@@ -249 +249 @@
 
         Statement * GenerateWaitForPass::postmutate( WaitForStmt * waitfor ) {
-                if( !decl_monitor || !decl_acceptable || !decl_mask ) throw SemanticError( "waitfor keyword requires monitors to be in scope, add #include <monitor>", waitfor );
+                if( !decl_monitor || !decl_acceptable || !decl_mask )
+                        SemanticError( waitfor, "waitfor keyword requires monitors to be in scope, add #include <monitor.hfa>" );
 
                 CompoundStmt * stmt = new CompoundStmt();
@@ -507 +508 @@
                         new ListInit({
                                 new SingleInit( new AddressExpr( new VariableExpr( index ) ) ),
-                                new SingleInit( new VariableExpr( acceptables ) ),
-                                new SingleInit( new ConstantExpr( Constant::from_ulong( count ) ) )
+                                new ListInit({
+                                        new SingleInit( new VariableExpr( acceptables ) ),
+                                        new SingleInit( new ConstantExpr( Constant::from_ulong( count ) ) )
+                                })
                         })
                 );