Changes in src/Concurrency/Keywords.cc [6cebfef:e84ab3d]

File:

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

src/Concurrency/Keywords.cc

@@ -302 +302 @@
                 void postvisit( FunctionDecl * decl );
                 void postvisit(   StructDecl * decl );
-                Statement * postmutate( MutexStmt * stmt );
 
                 std::list<DeclarationWithType*> findMutexArgs( FunctionDecl*, bool & first );
@@ -308 +307 @@
                 void addDtorStatements( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
                 void addStatements( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
-                void addStatements( CompoundStmt * body, const std::list<Expression * > & args );
                 void addThreadDtorStatements( FunctionDecl* func, CompoundStmt * body, const std::list<DeclarationWithType * > & args );
 
@@ -314 +312 @@
                         PassVisitor< MutexKeyword > impl;
                         acceptAll( translationUnit, impl );
-                        mutateAll( translationUnit, impl );
                 }
 
@@ -938 +935 @@
                         thread_guard_decl = decl;
                 }
-        }
-
-        Statement * MutexKeyword::postmutate( MutexStmt * stmt ) {
-                std::list<Statement *> stmtsForCtor;
-                stmtsForCtor.push_back(stmt->stmt);
-                CompoundStmt * body = new CompoundStmt( stmtsForCtor );
-                addStatements( body, stmt->mutexObjs);
-                return body;
         }
 
@@ -1069 +1058 @@
                         ))
                 );
-        }
-
-        void MutexKeyword::addStatements( CompoundStmt * body, const std::list<Expression * > & args ) {
-                ObjectDecl * monitors = new ObjectDecl(
-                        "__monitors",
-                        noStorageClasses,
-                        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, [](Expression * var ){
-                                        return new SingleInit( new UntypedExpr(
-                                                new NameExpr( "get_monitor" ),
-                                                { var }
-                                        ) );
-                                })
-                        )
-                );
-
-                // in reverse order :
-                // monitor_guard_t __guard = { __monitors, # };
-                body->push_front(
-                        new DeclStmt( new ObjectDecl(
-                                "__guard",
-                                noStorageClasses,
-                                LinkageSpec::Cforall,
-                                nullptr,
-                                new StructInstType(
-                                        noQualifiers,
-                                        guard_decl
-                                ),
-                                new ListInit(
-                                        {
-                                                new SingleInit( new VariableExpr( monitors ) ),
-                                                new SingleInit( new ConstantExpr( Constant::from_ulong( args.size() ) ) )
-                                        },
-                                        noDesignators,
-                                        true
-                                )
-                        ))
-                );
-
-                //monitor$ * __monitors[] = { get_monitor(a), get_monitor(b) };
-                body->push_front( new DeclStmt( monitors) );
         }