Changes in src/Concurrency/Actors.cpp [1ee74df:ed96731]

File:

• src/Concurrency/Actors.cpp (modified) (15 diffs)

src/Concurrency/Actors.cpp

@@ -29 +29 @@
 struct CollectactorStructDecls : public ast::WithGuards {
         unordered_set<const StructDecl *> & actorStructDecls;
-        unordered_set<const StructDecl *> & messageStructDecls;
-        const StructDecl *& requestDecl;
-        const EnumDecl *& allocationDecl;
-        const StructDecl *& actorDecl;
-        const StructDecl *& msgDecl;
+        unordered_set<const StructDecl *>  & messageStructDecls;
+        const StructDecl ** requestDecl;
+        const EnumDecl ** allocationDecl;
+        const StructDecl ** actorDecl;
+        const StructDecl ** msgDecl;
         StructDecl * parentDecl;
         bool insideStruct = false;
@@ -40 +40 @@
         // finds and sets a ptr to the allocation enum, which is needed in the next pass
         void previsit( const EnumDecl * decl ) {
-                if( decl->name == "allocation" ) allocationDecl = decl;
+                if( decl->name == "allocation" ) *allocationDecl = decl;
         }
 
@@ -48 +48 @@
                 if ( decl->name == "actor" ) {
                         actorStructDecls.insert( decl ); // skip inserting fwd decl
-                        actorDecl = decl;
+                        *actorDecl = decl;
                 } else if( decl->name == "message" ) {
                         messageStructDecls.insert( decl ); // skip inserting fwd decl
-                        msgDecl = decl;
-                } else if( decl->name == "request" ) {
-                        requestDecl = decl;
-                } else {
+                        *msgDecl = decl;
+                } else if( decl->name == "request" ) *requestDecl = decl;
+                else {
                         GuardValue(insideStruct);
                         insideStruct = true;
@@ -74 +73 @@
         // this collects the derived actor and message struct decl ptrs
         void postvisit( const StructInstType * node ) {
-                if ( !actorDecl || !msgDecl ) return;
+                if ( ! *actorDecl || ! *msgDecl ) return;
                 if ( insideStruct && !namedDecl ) {
                         auto actorIter = actorStructDecls.find( node->aggr() );
@@ -90 +89 @@
   public:
         CollectactorStructDecls( unordered_set<const StructDecl *> & actorStructDecls, unordered_set<const StructDecl *> & messageStructDecls,
-                const StructDecl *& requestDecl, const EnumDecl *& allocationDecl, const StructDecl *& actorDecl, const StructDecl *& msgDecl )
+                const StructDecl ** requestDecl, const EnumDecl ** allocationDecl, const StructDecl ** actorDecl, const StructDecl ** msgDecl )
                 : actorStructDecls( actorStructDecls ), messageStructDecls( messageStructDecls ), requestDecl( requestDecl ),
                 allocationDecl( allocationDecl ), actorDecl(actorDecl), msgDecl(msgDecl) {}
@@ -197 +196 @@
 struct GenFuncsCreateTables : public ast::WithDeclsToAdd {
         unordered_set<const StructDecl *> & actorStructDecls;
-        unordered_set<const StructDecl *> & messageStructDecls;
-        const StructDecl *& requestDecl;
-        const EnumDecl *& allocationDecl;
-        const StructDecl *& actorDecl;
-        const StructDecl *& msgDecl;
+        unordered_set<const StructDecl *>  & messageStructDecls;
+        const StructDecl ** requestDecl;
+        const EnumDecl ** allocationDecl;
+        const StructDecl ** actorDecl;
+        const StructDecl ** msgDecl;
         FwdDeclTable & forwardDecls;
 
@@ -280 +279 @@
                                                 decl->location,
                                                 "base_actor",
-                                                new PointerType( new PointerType( new StructInstType( actorDecl ) ) )
+                                                new PointerType( new PointerType( new StructInstType( *actorDecl ) ) )
                                         ),
                                         new ObjectDecl(
                                                 decl->location,
                                                 "base_msg",
-                                                new PointerType( new PointerType( new StructInstType( msgDecl ) ) )
+                                                new PointerType( new PointerType( new StructInstType( *msgDecl ) ) )
                                         )
                                 },                      // params
@@ -292 +291 @@
                                                 decl->location,
                                                 "__CFA_receive_wrap_ret",
-                                                new EnumInstType( allocationDecl )
+                                                new EnumInstType( *allocationDecl )
                                         )
                                 },
@@ -324 +323 @@
                                         decl->location,
                                         "new_req",
-                                        new StructInstType( requestDecl )
+                                        new StructInstType( *requestDecl )
                                 )
                         ));
@@ -332 +331 @@
                         derivedReceive->params.push_back( ast::deepCopy( derivedActorRef ) );
                         derivedReceive->params.push_back( ast::deepCopy( derivedMsgRef ) );
-                        derivedReceive->params.push_back( new PointerType( new PointerType( new StructInstType( actorDecl ) ) ) );
-                        derivedReceive->params.push_back( new PointerType( new PointerType( new StructInstType( msgDecl ) ) ) );
-                        derivedReceive->returns.push_back( new EnumInstType( allocationDecl ) );
+                        derivedReceive->params.push_back( new PointerType( new PointerType( new StructInstType( *actorDecl ) ) ) );
+                        derivedReceive->params.push_back( new PointerType( new PointerType( new StructInstType( *msgDecl ) ) ) );
+                        derivedReceive->returns.push_back( new EnumInstType( *allocationDecl ) );
 
                         // Generates: allocation (*my_work_fn)( derived_actor &, derived_msg &, actor **, message ** ) = receive;
@@ -349 +348 @@
                         // Function type is: allocation (*)( actor &, message & )
                         FunctionType * genericReceive = new FunctionType();
-                        genericReceive->params.push_back( new ReferenceType( new StructInstType( actorDecl ) ) );
-                        genericReceive->params.push_back( new ReferenceType( new StructInstType( msgDecl ) ) );
-                        genericReceive->params.push_back( new PointerType( new PointerType( new StructInstType( actorDecl ) ) ) );
-                        genericReceive->params.push_back( new PointerType( new PointerType( new StructInstType( msgDecl ) ) ) );
-                        genericReceive->returns.push_back( new EnumInstType( allocationDecl ) );
+                        genericReceive->params.push_back( new ReferenceType( new StructInstType( *actorDecl ) ) );
+                        genericReceive->params.push_back( new ReferenceType( new StructInstType( *msgDecl ) ) );
+                        genericReceive->params.push_back( new PointerType( new PointerType( new StructInstType( *actorDecl ) ) ) );
+                        genericReceive->params.push_back( new PointerType( new PointerType( new StructInstType( *msgDecl ) ) ) );
+                        genericReceive->returns.push_back( new EnumInstType( *allocationDecl ) );
 
                         // Generates: allocation (*fn)( actor &, message & ) = (allocation (*)( actor &, message & ))my_work_fn;
@@ -379 +378 @@
                                         {
                                                 new NameExpr( decl->location, "new_req" ),
-                                                new CastExpr( decl->location, new AddressExpr( new NameExpr( decl->location, "receiver" ) ), new PointerType( new StructInstType( actorDecl ) ), ExplicitCast ),
-                                                new CastExpr( decl->location, new AddressExpr( new NameExpr( decl->location, "msg" ) ), new PointerType( new StructInstType( msgDecl ) ), ExplicitCast ),
+                                                new CastExpr( decl->location, new AddressExpr( new NameExpr( decl->location, "receiver" ) ), new PointerType( new StructInstType( *actorDecl ) ), ExplicitCast ),
+                                                new CastExpr( decl->location, new AddressExpr( new NameExpr( decl->location, "msg" ) ), new PointerType( new StructInstType( *msgDecl ) ), ExplicitCast ),
                                                 new NameExpr( decl->location, "fn" )
                                         }
@@ -444 +443 @@
   public:
         GenFuncsCreateTables( unordered_set<const StructDecl *> & actorStructDecls, unordered_set<const StructDecl *> & messageStructDecls,
-                const StructDecl *& requestDecl, const EnumDecl *& allocationDecl, const StructDecl *& actorDecl, const StructDecl *& msgDecl,
+                const StructDecl ** requestDecl, const EnumDecl ** allocationDecl, const StructDecl ** actorDecl, const StructDecl ** msgDecl,
                 FwdDeclTable & forwardDecls ) : actorStructDecls(actorStructDecls), messageStructDecls(messageStructDecls),
                 requestDecl(requestDecl), allocationDecl(allocationDecl), actorDecl(actorDecl), msgDecl(msgDecl), forwardDecls(forwardDecls) {}
@@ -454 +453 @@
 struct FwdDeclOperator : public ast::WithDeclsToAdd {
         unordered_set<const StructDecl *> & actorStructDecls;
-        unordered_set<const StructDecl *> & messageStructDecls;
+        unordered_set<const StructDecl *>  & messageStructDecls;
         FwdDeclTable & forwardDecls;
 
@@ -496 +495 @@
         // for storing through the passes
         // these are populated with various important struct decls
-        const StructDecl * requestDecl = nullptr;
-        const EnumDecl * allocationDecl = nullptr;
-        const StructDecl * actorDecl = nullptr;
-        const StructDecl * msgDecl = nullptr;
+        const StructDecl * requestDeclPtr = nullptr;
+        const EnumDecl * allocationDeclPtr = nullptr;
+        const StructDecl * actorDeclPtr = nullptr;
+        const StructDecl * msgDeclPtr = nullptr;
+
+        // double pointer to modify local ptrs above
+        const StructDecl ** requestDecl = &requestDeclPtr;
+        const EnumDecl ** allocationDecl = &allocationDeclPtr;
+        const StructDecl ** actorDecl = &actorDeclPtr;
+        const StructDecl ** msgDecl = &msgDeclPtr;
 
         // first pass collects ptrs to allocation enum, request type, and generic receive fn typedef
         // also populates maps of all derived actors and messages
-        Pass<CollectactorStructDecls>::run( translationUnit, actorStructDecls, messageStructDecls,
-                requestDecl, allocationDecl, actorDecl, msgDecl );
+        Pass<CollectactorStructDecls>::run( translationUnit, actorStructDecls, messageStructDecls, requestDecl,
+                allocationDecl, actorDecl, msgDecl );
 
         // check that we have found all the decls we need from <actor.hfa>, if not no need to run the rest of this pass
-        if ( !allocationDecl || !requestDecl || !actorDecl || !msgDecl )
+        if ( !allocationDeclPtr || !requestDeclPtr || !actorDeclPtr || !msgDeclPtr )
                 return;
 
         // second pass locates all receive() routines that overload the generic receive fn
         // it then generates the appropriate operator '|' send routines for the receive routines
-        Pass<GenFuncsCreateTables>::run( translationUnit, actorStructDecls, messageStructDecls,
-                requestDecl, allocationDecl, actorDecl, msgDecl, forwardDecls );
+        Pass<GenFuncsCreateTables>::run( translationUnit, actorStructDecls, messageStructDecls, requestDecl,
+                allocationDecl, actorDecl, msgDecl, forwardDecls );
 
         // The third pass forward declares operator '|' send routines