Changes in src/SymTab/Autogen.cc [615a096:bcda04c]

File:

• src/SymTab/Autogen.cc (modified) (2 diffs)

src/SymTab/Autogen.cc

@@ -218 +218 @@
 
                 /// generates a function (?{}, ?=?, ^?{}) based on the data argument and members. If function is generated, inserts the type into the map.
-                void gen( const FuncData & data ) {
+                void gen( const FuncData & data, bool concurrent_type ) {
                         if ( ! shouldGenerate( data.map, aggregateDecl ) ) return;
                         FunctionType * ftype = data.genType( refType );
+
+                        if(concurrent_type && InitTweak::isDestructor( data.fname )) {
+                                ftype->get_parameters().front()->get_type()->set_mutex( true );
+                        }
+
                         cloneAll( typeParams, ftype->get_forall() );
                         *out++ = genFunc( data.fname, ftype, functionNesting );
@@ -403 +408 @@
                 auto generator = makeFuncGenerator( aggregateDecl, refType, functionNesting, typeParams, back_inserter( newFuncs ) );
                 for ( const FuncData & d : data ) {
-                        generator.gen( d );
-                }
+                        generator.gen( d, aggregateDecl->is_thread() || aggregateDecl->is_monitor() );
+                }
+
                 // field ctors are only generated if default constructor and copy constructor are both generated
                 unsigned numCtors = std::count_if( newFuncs.begin(), newFuncs.end(), [](FunctionDecl * dcl) { return InitTweak::isConstructor( dcl->get_name() ); } );