Changes in src/Concurrency/Keywords.cc [9243cc91:64adb03]

File:

• src/Concurrency/Keywords.cc (modified) (7 diffs)

src/Concurrency/Keywords.cc

@@ -88 +88 @@
         //Handles mutex routines definitions :
         // void foo( A * mutex a, B * mutex b,  int i ) {                  void foo( A * a, B * b,  int i ) {
-        //                                                                       monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
+        //                                                                       monitor_desc * __monitors[] = { a, b };
         //                                                                       monitor_guard_t __guard = { __monitors, 2 };
         //    /*Some code*/                                       =>           /*Some code*/
@@ -98 +98 @@
                 using Visitor::visit;
                 virtual void visit( FunctionDecl *functionDecl ) override final;
-                virtual void visit(   StructDecl *functionDecl ) override final;
 
                 std::list<DeclarationWithType*> findMutexArgs( FunctionDecl* );
@@ -108 +107 @@
                         acceptAll( translationUnit, impl );
                 }
-
-          private:
-                StructDecl* monitor_decl = nullptr;
         };
 
@@ -137 +133 @@
                 if( ! body ) return;
 
-                assert(monitor_decl);
                 addStatments( body, mutexArgs );
-        }
-
-        void MutexKeyword::visit(StructDecl* decl) {
-                if( decl->get_name() == "monitor_desc" ) {
-                        assert( !monitor_decl );
-                        monitor_decl = decl;
-                }
         }
 
@@ -179 +167 @@
 
         void MutexKeyword::addStatments( CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
-
-                ObjectDecl * monitors = new ObjectDecl(
-                        "__monitors",
-                        noStorage,
-                        LinkageSpec::Cforall,
-                        nullptr,
-                        new ArrayType(
-                                noQualifiers,
-                                new PointerType(
-                                        noQualifiers,
-                                        new StructInstType(
-                                                noQualifiers,
-                                                monitor_decl
-                                        )
-                                ),
-                                new ConstantExpr( Constant::from_ulong( args.size() ) ),
-                                false,
-                                false
-                        ),
-                        new ListInit(
-                                map_range < std::list<Initializer*> > ( args, [](DeclarationWithType * var ){
-                                        return new SingleInit( new UntypedExpr(
-                                                new NameExpr( "get_monitor" ),
-                                                {  new VariableExpr( var ) }
-                                        ) );
-                                })
-                        )
-                );
-
                 //in reverse order :
                 // monitor_guard_t __guard = { __monitors, # };
@@ -222 +181 @@
                                 new ListInit(
                                         {
-                                                new SingleInit( new VariableExpr( monitors ) ),
+                                                new SingleInit( new NameExpr( "__monitors" ) ),
                                                 new SingleInit( new ConstantExpr( Constant::from_ulong( args.size() ) ) )
                                         }
@@ -230 +189 @@
 
                 //monitor_desc * __monitors[] = { a, b };
-                body->push_front( new DeclStmt( noLabels, monitors) );
+                body->push_front(
+                        new DeclStmt( noLabels, new ObjectDecl(
+                                "__monitors",
+                                noStorage,
+                                LinkageSpec::Cforall,
+                                nullptr,
+                                new ArrayType(
+                                        noQualifiers,
+                                        new PointerType(
+                                                noQualifiers,
+                                                new StructInstType(
+                                                        noQualifiers,
+                                                        "monitor_desc"
+                                                )
+                                        ),
+                                        new ConstantExpr( Constant::from_ulong( args.size() ) ),
+                                        false,
+                                        false
+                                ),
+                                new ListInit(
+                                        map_range < std::list<Initializer*> > ( args, [](DeclarationWithType * var ){
+                                                return new SingleInit( new VariableExpr( var ) );
+                                        })
+                                )
+                        ))
+                );
         }
 };