Changeset df5b2c8

Timestamp:

Aug 4, 2021, 1:24:51 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

5541ea3d

Parents:

1e567ab (diff), da602aec (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

Location:

src/ControlStruct

Files:

• ExceptDecl.cc (modified) (3 diffs)
• ExceptTranslate.cc (modified) (3 diffs)

src/ControlStruct/ExceptDecl.cc

@@ -10 +10 @@
 // Created On       : Tue Jul 20 04:10:50 2021
 // Last Modified By : Henry Xue
-// Last Modified On : Mon Jul 26 12:55:28 2021
-// Update Count     : 3
+// Last Modified On : Tue Aug 03 10:42:26 2021
+// Update Count     : 4
 //
 
@@ -278 +278 @@
         cloneAll( forallClause, structDecl->parameters );
         return structDecl;
+}
+
+ObjectDecl * ehmTypeIdExtern(
+        const std::string & exceptionName,
+        const std::list< Expression *> & parameters
+) {
+        StructInstType * typeIdType = new StructInstType(
+                Type::Const,
+                Virtual::typeIdType( exceptionName )
+        );
+        cloneAll( parameters, typeIdType->parameters );
+        return new ObjectDecl(
+                Virtual::typeIdName( exceptionName ),
+                Type::Extern,
+                LinkageSpec::Cforall,
+                nullptr,
+                typeIdType,
+                nullptr,
+                { new Attribute( "cfa_linkonce" ) }
+        );
 }
 
@@ -421 +441 @@
 
                 if ( objectDecl->get_storageClasses().is_extern ) { // if extern
+                        if ( !parameters.empty() ) { // forall variant
+                                declsToAddBefore.push_back( ehmTypeIdExtern( exceptionName, parameters ) );
+                        }
                         return ehmExternVtable( exceptionName, parameters, tableName );
                 }

src/ControlStruct/ExceptTranslate.cc

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Wed Jun 14 16:49:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Jun 24 11:18:00 2020
-// Update Count     : 17
+// Last Modified By : Henry Xue
+// Last Modified On : Tue Aug 03 10:05:51 2021
+// Update Count     : 18
 //
 
@@ -320 +320 @@
                                 static_cast<ObjectDecl *>( handler->get_decl() );
                         ObjectDecl * local_except = handler_decl->clone();
-                        local_except->set_init(
-                                new ListInit({ new SingleInit(
-                                        new VirtualCastExpr( nameOf( except_obj ),
-                                                local_except->get_type()
-                                                )
-                                        ) })
+                        VirtualCastExpr * vcex = new VirtualCastExpr(
+                                nameOf( except_obj ),
+                                local_except->get_type()
                                 );
+                        vcex->location = handler->location;
+                        local_except->set_init( new ListInit({ new SingleInit( vcex ) }) );
                         block->push_back( new DeclStmt( local_except ) );
 
@@ -392 +391 @@
 
                 // Check for type match.
-                Expression * cond = UntypedExpr::createAssign( nameOf( local_except ),
-                        new VirtualCastExpr( nameOf( except_obj ),
-                                local_except->get_type()->clone() ) );
+                VirtualCastExpr * vcex = new VirtualCastExpr(
+                        nameOf( except_obj ),
+                        local_except->get_type()->clone()
+                        );
+                vcex->location = modded_handler->location;
+                Expression * cond = UntypedExpr::createAssign(
+                        nameOf( local_except ), vcex );
 
                 // Add the check on the conditional if it is provided.