Changeset 2a301ff for src/Concurrency/KeywordsNew.cpp

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• src/Concurrency/KeywordsNew.cpp (modified) (9 diffs)

src/Concurrency/KeywordsNew.cpp

@@ -534 +534 @@
 void ConcurrentSueKeyword::addGetRoutines(
                 const ast::ObjectDecl * field, const ast::FunctionDecl * forward ) {
+        // Clone the signature and then build the body.
+        ast::FunctionDecl * decl = ast::deepCopy( forward );
+
         // Say it is generated at the "same" places as the forward declaration.
-        const CodeLocation & location = forward->location;
-
-        const ast::DeclWithType * param = forward->params.front();
+        const CodeLocation & location = decl->location;
+
+        const ast::DeclWithType * param = decl->params.front();
         ast::Stmt * stmt = new ast::ReturnStmt( location,
                 new ast::AddressExpr( location,
@@ -551 +554 @@
         );
 
-        ast::FunctionDecl * decl = ast::deepCopy( forward );
         decl->stmts = new ast::CompoundStmt( location, { stmt } );
         declsToAddAfter.push_back( decl );
@@ -1236 +1238 @@
 }
 
+void flattenTuple( const ast::UntypedTupleExpr * tuple, std::vector<ast::ptr<ast::Expr>> & output ) {
+    for ( auto & expr : tuple->exprs ) {
+        const ast::UntypedTupleExpr * innerTuple = dynamic_cast<const ast::UntypedTupleExpr *>(expr.get());
+        if ( innerTuple ) flattenTuple( innerTuple, output );
+        else output.emplace_back( ast::deepCopy( expr ));
+    }
+}
+
 ast::CompoundStmt * MutexKeyword::addStatements(
                 const ast::CompoundStmt * body,
@@ -1248 +1258 @@
         // std::string lockFnName = mutex_func_namer.newName();
         // std::string unlockFnName = mutex_func_namer.newName();
+
+    // If any arguments to the mutex stmt are tuples, flatten them
+    std::vector<ast::ptr<ast::Expr>> flattenedArgs;
+    for ( auto & arg : args ) {
+        const ast::UntypedTupleExpr * tuple = dynamic_cast<const ast::UntypedTupleExpr *>(args.at(0).get());
+        if ( tuple ) flattenTuple( tuple, flattenedArgs );
+        else flattenedArgs.emplace_back( ast::deepCopy( arg ));
+    }
 
         // Make pointer to the monitors.
@@ -1257 +1275 @@
                                 new ast::VoidType()
                         ),
-                        ast::ConstantExpr::from_ulong( location, args.size() ),
+                        ast::ConstantExpr::from_ulong( location, flattenedArgs.size() ),
                         ast::FixedLen,
                         ast::DynamicDim
@@ -1264 +1282 @@
                         location,
                         map_range<std::vector<ast::ptr<ast::Init>>>(
-                                args, [](const ast::Expr * expr) {
+                                flattenedArgs, [](const ast::Expr * expr) {
                                         return new ast::SingleInit(
                                                 expr->location,
@@ -1287 +1305 @@
 
         // adds a nested try stmt for each lock we are locking
-        for ( long unsigned int i = 0; i < args.size(); i++ ) {
+        for ( long unsigned int i = 0; i < flattenedArgs.size(); i++ ) {
                 ast::UntypedExpr * innerAccess = new ast::UntypedExpr( 
                         location,
@@ -1298 +1316 @@
                 // make the try body
                 ast::CompoundStmt * currTryBody = new ast::CompoundStmt( location );
-                ast::IfStmt * lockCall = genTypeDiscrimLockUnlock( "lock", args, location, innerAccess );
+                ast::IfStmt * lockCall = genTypeDiscrimLockUnlock( "lock", flattenedArgs, location, innerAccess );
                 currTryBody->push_back( lockCall );
 
                 // make the finally stmt
                 ast::CompoundStmt * currFinallyBody = new ast::CompoundStmt( location );
-                ast::IfStmt * unlockCall = genTypeDiscrimLockUnlock( "unlock", args, location, innerAccess );
+                ast::IfStmt * unlockCall = genTypeDiscrimLockUnlock( "unlock", flattenedArgs, location, innerAccess );
                 currFinallyBody->push_back( unlockCall );
 
@@ -1343 +1361 @@
                                                 new ast::SingleInit(
                                                         location,
-                                                        ast::ConstantExpr::from_ulong( location, args.size() ) ),
+                                                        ast::ConstantExpr::from_ulong( location, flattenedArgs.size() ) ),
                                         },
                                         {},