Changeset 7e4bd9b6

Timestamp:

Jun 14, 2023, 4:43:21 PM (23 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

1e940de0

Parents:

5668740

Message:

updated actor-related passes to fix some bugs

Location:

src

Files:

• Concurrency/Actors.cpp (modified) (2 diffs)
• Virtual/VirtualDtor.cpp (modified) (1 diff)

src/Concurrency/Actors.cpp

@@ -285 +285 @@
             ));
 
-            // Generates: new_req{ &receiver, &msg, fn };
+            // Generates: new_req{ &receiver, (actor *)&receiver, &msg, (message *)&msg, fn };
             sendBody->push_back( new ExprStmt(
                 decl->location,
@@ -294 +294 @@
                                                 new NameExpr( decl->location, "new_req" ),
                         new AddressExpr( new NameExpr( decl->location, "receiver" ) ),
+                        new CastExpr( decl->location, new AddressExpr( new NameExpr( decl->location, "receiver" ) ), new PointerType( new StructInstType( *actorDecl ) ), ExplicitCast ),
                         new AddressExpr( new NameExpr( decl->location, "msg" ) ),
+                        new CastExpr( decl->location, new AddressExpr( new NameExpr( decl->location, "msg" ) ), new PointerType( new StructInstType( *msgDecl ) ), ExplicitCast ),
                         new NameExpr( decl->location, "fn" )
                                         }

src/Virtual/VirtualDtor.cpp

@@ -146 +146 @@
 
             CompoundStmt * dtorBody = mutate( decl->stmts.get() );
-            // Adds the following to the end of any actor/message dtor:
+            // Adds the following to the start of any actor/message dtor:
             //  __CFA_dtor_shutdown( this );
-            dtorBody->push_front( new ExprStmt(
-                decl->location,
-                                new UntypedExpr (
-                    decl->location,
-                                        new NameExpr( decl->location, "__CFA_dtor_shutdown" ),
-                                        {
-                        new NameExpr( decl->location, decl->params.at(0)->name )
-                                        }
-                                )
-                        ));
+            dtorBody->push_front( 
+                new IfStmt( decl->location,
+                    new UntypedExpr (
+                        decl->location,
+                        new NameExpr( decl->location, "__CFA_dtor_shutdown" ),
+                        {
+                            new NameExpr( decl->location, decl->params.at(0)->name )
+                        }
+                    ),
+                    new ReturnStmt( decl->location, nullptr )
+                )
+            );
             return;
         }