Changeset 8e4bc30 for src/Concurrency/Keywords.cc

Timestamp:

Oct 8, 2020, 12:45:43 PM (5 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:

8fc9a5f, baee756

Parents:

391c065 (diff), 6fbe9a5 (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) (6 diffs)

src/Concurrency/Keywords.cc

@@ -66 +66 @@
                         bool needs_main, AggregateDecl::Aggregate cast_target ) :
                   type_name( type_name ), field_name( field_name ), getter_name( getter_name ),
-                  context_error( context_error ), vtable_name( getVTableName( exception_name ) ),
+                  context_error( context_error ), exception_name( exception_name ),
+                  vtable_name( getVTableName( exception_name ) ),
                   needs_main( needs_main ), cast_target( cast_target ) {}
 
@@ -89 +90 @@
                 const std::string getter_name;
                 const std::string context_error;
+                const std::string exception_name;
                 const std::string vtable_name;
                 bool needs_main;
@@ -95 +97 @@
                 StructDecl   * type_decl = nullptr;
                 FunctionDecl * dtor_decl = nullptr;
+                StructDecl * except_decl = nullptr;
                 StructDecl * vtable_decl = nullptr;
         };
@@ -376 +379 @@
                 else if ( is_target(decl) ) {
                         handle( decl );
+                }
+                else if ( !except_decl && exception_name == decl->name && decl->body ) {
+                        except_decl = decl;
                 }
                 else if ( !vtable_decl && vtable_name == decl->name && decl->body ) {
@@ -398 +404 @@
                         assert( struct_type );
 
-                        declsToAddAfter.push_back( Virtual::makeVtableInstance( vtable_decl, {
-                                new TypeExpr( struct_type->clone() ),
-                        }, struct_type, nullptr ) );
+                        std::list< Expression * > poly_args = { new TypeExpr( struct_type->clone() ) };
+                        ObjectDecl * vtable_object = Virtual::makeVtableInstance(
+                                vtable_decl->makeInst( poly_args ), struct_type, nullptr );
+                        declsToAddAfter.push_back( vtable_object );
+                        declsToAddAfter.push_back( Virtual::makeGetExceptionFunction(
+                                vtable_object, except_decl->makeInst( std::move( poly_args ) )
+                        ) );
                 }
 
@@ -434 +444 @@
         void ConcurrentSueKeyword::addVtableForward( StructDecl * decl ) {
                 if ( vtable_decl ) {
-                        declsToAddBefore.push_back( Virtual::makeVtableForward( vtable_decl, {
+                        std::list< Expression * > poly_args = {
                                 new TypeExpr( new StructInstType( noQualifiers, decl ) ),
-                        } ) );
+                        };
+                        declsToAddBefore.push_back( Virtual::makeGetExceptionForward(
+                                vtable_decl->makeInst( poly_args ),
+                                except_decl->makeInst( poly_args )
+                        ) );
+                        declsToAddBefore.push_back( Virtual::makeVtableForward(
+                                vtable_decl->makeInst( move( poly_args ) ) ) );
                 // Its only an error if we want a vtable and don't have one.
                 } else if ( ! vtable_name.empty() ) {