Changes in src/Concurrency/Keywords.cc [ab8c6a6:69c5c00]

File:

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

src/Concurrency/Keywords.cc

@@ -46 +46 @@
         }
 
-        // Only detects threads constructed with the keyword thread.
-        inline static bool isThread( DeclarationWithType * decl ) {
-                Type * baseType = decl->get_type()->stripDeclarator();
-                StructInstType * instType = dynamic_cast<StructInstType *>( baseType );
-                if ( nullptr == instType ) { return false; }
-                return instType->baseStruct->is_thread();
-        }
-
         //=============================================================================================
         // Pass declarations
@@ -127 +119 @@
                         "get_thread",
                         "thread keyword requires threads to be in scope, add #include <thread.hfa>\n",
-                        "ThreadCancelled",
+                        "",
                         true,
                         AggregateDecl::Thread
@@ -298 +290 @@
                 std::list<DeclarationWithType*> findMutexArgs( FunctionDecl*, bool & first );
                 void validate( DeclarationWithType * );
-                void addDtorStatements( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
-                void addStatements( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
-                void addThreadDtorStatements( FunctionDecl* func, CompoundStmt * body, const std::list<DeclarationWithType * > & args );
+                void addDtorStatments( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
+                void addStatments( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
 
                 static void implement( std::list< Declaration * > & translationUnit ) {
@@ -311 +302 @@
                 StructDecl* guard_decl = nullptr;
                 StructDecl* dtor_guard_decl = nullptr;
-                StructDecl* thread_guard_decl = nullptr;
 
                 static std::unique_ptr< Type > generic_func;
@@ -811 +801 @@
                 bool first = false;
                 std::list<DeclarationWithType*> mutexArgs = findMutexArgs( decl, first );
-                bool const isDtor = CodeGen::isDestructor( decl->name );
+                bool isDtor = CodeGen::isDestructor( decl->name );
 
                 // Is this function relevant to monitors
@@ -859 +849 @@
 
                 // Instrument the body
-                if ( isDtor && isThread( mutexArgs.front() ) ) {
-                        if( !thread_guard_decl ) {
-                                SemanticError( decl, "thread destructor requires threads to be in scope, add #include <thread.hfa>\n" );
-                        }
-                        addThreadDtorStatements( decl, body, mutexArgs );
-                }
-                else if ( isDtor ) {
-                        addDtorStatements( decl, body, mutexArgs );
+                if( isDtor ) {
+                        addDtorStatments( decl, body, mutexArgs );
                 }
                 else {
-                        addStatements( decl, body, mutexArgs );
+                        addStatments( decl, body, mutexArgs );
                 }
         }
@@ -886 +870 @@
                         assert( !dtor_guard_decl );
                         dtor_guard_decl = decl;
-                }
-                else if( decl->name == "thread_dtor_guard_t" && decl->body ) {
-                        assert( !thread_guard_decl );
-                        thread_guard_decl = decl;
                 }
         }
@@ -928 +908 @@
         }
 
-        void MutexKeyword::addDtorStatements( FunctionDecl* func, CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
+        void MutexKeyword::addDtorStatments( FunctionDecl* func, CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
                 Type * arg_type = args.front()->get_type()->clone();
                 arg_type->set_mutex( false );
@@ -977 +957 @@
 
                 //$monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
-                body->push_front( new DeclStmt( monitors ) );
-        }
-
-        void MutexKeyword::addThreadDtorStatements(
-                        FunctionDecl*, CompoundStmt * body,
-                        const std::list<DeclarationWithType * > & args ) {
-                assert( args.size() == 1 );
-                DeclarationWithType * arg = args.front();
-                Type * arg_type = arg->get_type()->clone();
-                assert( arg_type->get_mutex() );
-                arg_type->set_mutex( false );
-
-                // thread_dtor_guard_t __guard = { this, intptr( 0 ) };
-                body->push_front(
-                        new DeclStmt( new ObjectDecl(
-                                "__guard",
-                                noStorageClasses,
-                                LinkageSpec::Cforall,
-                                nullptr,
-                                new StructInstType(
-                                        noQualifiers,
-                                        thread_guard_decl
-                                ),
-                                new ListInit(
-                                        {
-                                                new SingleInit( new CastExpr( new VariableExpr( arg ), arg_type ) ),
-                                                new SingleInit( new UntypedExpr(
-                                                        new NameExpr( "intptr" ), {
-                                                                new ConstantExpr( Constant::from_int( 0 ) ),
-                                                        }
-                                                ) ),
-                                        },
-                                        noDesignators,
-                                        true
-                                )
-                        ))
-                );
-        }
-
-        void MutexKeyword::addStatements( FunctionDecl* func, CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
+                body->push_front( new DeclStmt( monitors) );
+        }
+
+        void MutexKeyword::addStatments( FunctionDecl* func, CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
                 ObjectDecl * monitors = new ObjectDecl(
                         "__monitors",