Changeset c13e8dc8 for src/Concurrency/Waitfor.cc

Timestamp:

Dec 5, 2017, 2:35:03 PM (8 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:

f9feab8

Parents:

9c35431 (diff), 65197c2 (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) (18 diffs)

src/Concurrency/Waitfor.cc

@@ -100 +100 @@
 
 namespace Concurrency {
-
-        namespace {
-                const std::list<Label> noLabels;
-                const std::list< Attribute * > noAttributes;
-                Type::StorageClasses noStorage;
-                Type::Qualifiers noQualifiers;
-        }
-
         //=============================================================================================
         // Pass declarations
@@ -203 +195 @@
                         ResolvExpr::findVoidExpression( expr, indexer );
 
-                        return new ExprStmt( noLabels, expr );
+                        return new ExprStmt( expr );
                 }
 
@@ -259 +251 @@
                 if( !decl_monitor || !decl_acceptable || !decl_mask ) throw SemanticError( "waitfor keyword requires monitors to be in scope, add #include <monitor>", waitfor );
 
-                CompoundStmt * stmt = new CompoundStmt( noLabels );
+                CompoundStmt * stmt = new CompoundStmt();
 
                 ObjectDecl * acceptables = declare( waitfor->clauses.size(), stmt );
@@ -281 +273 @@
                 );
 
-                CompoundStmt * compound = new CompoundStmt( noLabels );
+                CompoundStmt * compound = new CompoundStmt();
                 stmt->push_back( new IfStmt(
-                        noLabels,
                         safeCond( new VariableExpr( flag ) ),
                         compound,
@@ -313 +304 @@
                 );
 
-                stmt->push_back( new DeclStmt( noLabels, acceptables) );
+                stmt->push_back( new DeclStmt( acceptables) );
 
                 Expression * set = new UntypedExpr(
@@ -326 +317 @@
                 ResolvExpr::findVoidExpression( set, indexer );
 
-                stmt->push_back( new ExprStmt( noLabels, set ) );
+                stmt->push_back( new ExprStmt( set ) );
 
                 return acceptables;
@@ -341 +332 @@
                 );
 
-                stmt->push_back( new DeclStmt( noLabels, flag) );
+                stmt->push_back( new DeclStmt( flag) );
 
                 return flag;
@@ -357 +348 @@
                 ResolvExpr::findVoidExpression( expr, indexer );
 
-                return new ExprStmt( noLabels, expr );
+                return new ExprStmt( expr );
         }
 
@@ -399 +390 @@
                 );
 
-                stmt->push_back( new DeclStmt( noLabels, mon) );
+                stmt->push_back( new DeclStmt( mon) );
 
                 return mon;
@@ -411 +402 @@
 
                 stmt->push_back( new IfStmt(
-                        noLabels,
                         safeCond( clause.condition ),
                         new CompoundStmt({
@@ -447 +437 @@
                 );
 
-                stmt->push_back( new DeclStmt( noLabels, timeout ) );
+                stmt->push_back( new DeclStmt( timeout ) );
 
                 if( time ) {
                         stmt->push_back( new IfStmt(
-                                noLabels,
                                 safeCond( time_cond ),
                                 new CompoundStmt({
                                         new ExprStmt(
-                                                noLabels,
                                                 makeOpAssign(
                                                         new VariableExpr( timeout ),
@@ -471 +459 @@
                 if( has_else ) {
                         stmt->push_back( new IfStmt(
-                                noLabels,
                                 safeCond( else_cond ),
                                 new CompoundStmt({
                                         new ExprStmt(
-                                                noLabels,
                                                 makeOpAssign(
                                                         new VariableExpr( timeout ),
@@ -511 +497 @@
                 );
 
-                stmt->push_back( new DeclStmt( noLabels, index ) );
+                stmt->push_back( new DeclStmt( index ) );
 
                 ObjectDecl * mask = ObjectDecl::newObject(
@@ -526 +512 @@
                 );
 
-                stmt->push_back( new DeclStmt( noLabels, mask ) );
+                stmt->push_back( new DeclStmt( mask ) );
 
                 stmt->push_back( new ExprStmt(
-                        noLabels,
                         new ApplicationExpr(
                                 VariableExpr::functionPointer( decl_waitfor ),
@@ -557 +542 @@
         ) {
                 SwitchStmt * swtch = new SwitchStmt(
-                        noLabels,
                         result,
                         std::list<Statement *>()
@@ -566 +550 @@
                         swtch->statements.push_back(
                                 new CaseStmt(
-                                        noLabels,
                                         new ConstantExpr( Constant::from_ulong( i++ ) ),
                                         {
                                                 clause.statement,
                                                 new BranchStmt(
-                                                        noLabels,
                                                         "",
                                                         BranchStmt::Break
@@ -583 +565 @@
                         swtch->statements.push_back(
                                 new CaseStmt(
-                                        noLabels,
                                         new ConstantExpr( Constant::from_int( -2 ) ),
                                         {
                                                 waitfor->timeout.statement,
                                                 new BranchStmt(
-                                                        noLabels,
                                                         "",
                                                         BranchStmt::Break
@@ -600 +580 @@
                         swtch->statements.push_back(
                                 new CaseStmt(
-                                        noLabels,
                                         new ConstantExpr( Constant::from_int( -1 ) ),
                                         {
                                                 waitfor->orelse.statement,
                                                 new BranchStmt(
-                                                        noLabels,
                                                         "",
                                                         BranchStmt::Break