Changeset 578c09a for src/Concurrency/Keywords.cc

Timestamp:

Apr 23, 2021, 11:53:33 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

aaf92de

Parents:

b39e6566 (diff), b583113 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/Concurrency/Keywords.cc

@@ -414 +414 @@
                 if ( type_decl && isDestructorFor( decl, type_decl ) )
                         dtor_decl = decl;
-                else if ( vtable_name.empty() )
-                        ;
-                else if( !decl->has_body() )
+                else if ( vtable_name.empty() || !decl->has_body() )
                         ;
                 else if ( auto param = isMainFor( decl, cast_target ) ) {
@@ -428 +426 @@
                         std::list< Expression * > poly_args = { new TypeExpr( struct_type->clone() ) };
                         ObjectDecl * vtable_object = Virtual::makeVtableInstance(
+                                "_default_vtable_object_declaration",
                                 vtable_decl->makeInst( poly_args ), struct_type, nullptr );
                         declsToAddAfter.push_back( vtable_object );
+                        declsToAddAfter.push_back(
+                                new ObjectDecl(
+                                        Virtual::concurrentDefaultVTableName(),
+                                        Type::Const,
+                                        LinkageSpec::Cforall,
+                                        /* bitfieldWidth */ nullptr,
+                                        new ReferenceType( Type::Const, vtable_object->type->clone() ),
+                                        new SingleInit( new VariableExpr( vtable_object ) )
+                                )
+                        );
                         declsToAddAfter.push_back( Virtual::makeGetExceptionFunction(
                                 vtable_object, except_decl->makeInst( std::move( poly_args ) )
@@ -488 +497 @@
                         except_decl->makeInst( poly_args )
                 ) );
-                declsToAddBefore.push_back( Virtual::makeVtableForward(
-                        vtable_decl->makeInst( move( poly_args ) ) ) );
+                ObjectDecl * vtable_object = Virtual::makeVtableForward(
+                        "_default_vtable_object_declaration",
+                        vtable_decl->makeInst( move( poly_args ) ) );
+                declsToAddBefore.push_back( vtable_object );
+                declsToAddAfter.push_back(
+                        new ObjectDecl(
+                                Virtual::concurrentDefaultVTableName(),
+                                Type::Const,
+                                LinkageSpec::Cforall,
+                                /* bitfieldWidth */ nullptr,
+                                new ReferenceType( Type::Const, vtable_object->type->clone() ),
+                                /* init */ nullptr
+                        )
+                );
         }