Changeset bcda04c for src/SymTab

Timestamp:

Mar 23, 2017, 11:37:27 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

bd4d011

Parents:

578b637

Message:

Fixed autogen constructors for concurrent sues

Location:

src/SymTab

Files:

• Autogen.cc (modified) (2 diffs)
• Validate.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() ); } );

src/SymTab/Validate.cc ¶

@@ -43 +43 @@
 #include "Common/utility.h"
 #include "Common/UniqueName.h"
+#include "Concurrency/Keywords.h"
 #include "Validate.h"
 #include "SynTree/Visitor.h"
@@ -225 +226 @@
                 ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
                 acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
+                Concurrency::applyKeywords( translationUnit );
                 autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecayPass
+                Concurrency::implementMutexFuncs( translationUnit );
+                Concurrency::implementThreadStarter( translationUnit );
                 acceptAll( translationUnit, epc );
                 ReturnChecker::checkFunctionReturns( translationUnit );