Changeset 2a301ff for src/ControlStruct/ExceptDeclNew.cpp

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• src/ControlStruct/ExceptDeclNew.cpp (modified) (7 diffs)

src/ControlStruct/ExceptDeclNew.cpp

@@ -242 +242 @@
 }
 
-ast::ObjectDecl const * createExternVTable(
+ast::ObjectDecl * createExternVTable(
                 CodeLocation const & location,
                 std::string const & exceptionName,
@@ -299 +299 @@
                 } ),
                 ast::Storage::Classes(),
-                ast::Linkage::Cforall
+                ast::Linkage::Cforall,
+                { new ast::Attribute( "cfa_linkonce" ) }
         );
 }
@@ -352 +353 @@
                 } ),
                 ast::Storage::Classes(),
-                ast::Linkage::Cforall
-        );
-}
-
-ast::ObjectDecl const * createVirtualTable(
+                ast::Linkage::Cforall,
+                { new ast::Attribute( "cfa_linkonce" ) }
+        );
+}
+
+ast::ObjectDecl * createVirtualTable(
                 CodeLocation const & location,
                 std::string const & exceptionName,
@@ -451 +453 @@
         std::string const & tableName = decl->name;
 
+        ast::ObjectDecl * retDecl;
         if ( decl->storage.is_extern ) {
                 // Unique type-ids are only needed for polymorphic instances.
@@ -457 +460 @@
                                 createExternTypeId( location, exceptionName, params ) );
                 }
-                return createExternVTable( location, exceptionName, params, tableName );
+                retDecl = createExternVTable( location, exceptionName, params, tableName );
         } else {
                 // Unique type-ids are only needed for polymorphic instances.
@@ -468 +471 @@
                 declsToAddBefore.push_back(
                         createMsg( location, exceptionName, params ) );
-                return createVirtualTable(
+                retDecl = createVirtualTable(
                         location, exceptionName, params, tableName );
         }
+
+        for ( ast::ptr<ast::Attribute> const & attr : decl->attributes ) {
+                retDecl->attributes.push_back( attr );
+        }
+
+        return retDecl;
 }
 
@@ -478 +487 @@
 
                 std::string vtableName = Virtual::vtableTypeName( inst->name );
+
                 auto newType = new ast::StructInstType( vtableName );
                 for ( ast::ptr<ast::Expr> const & param : inst->params ) {