Changeset 8d66610 for src/Virtual

Timestamp:

May 21, 2021, 4:48:10 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, stuck-waitfor-destruct

Children:

f1bce515

Parents:

5407cdc (diff), 7404cdc (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/Virtual

Files:

• ExpandCasts.cc (modified) (2 diffs)
• Tables.cc (modified) (2 diffs)

src/Virtual/ExpandCasts.cc

@@ -105 +105 @@
         void VirtualCastCore::premutate( FunctionDecl * functionDecl ) {
                 if ( (! vcast_decl) &&
-                     functionDecl->get_name() == "__cfa__virtual_cast" ) {
+                     functionDecl->get_name() == "__cfavir_virtual_cast" ) {
                         vcast_decl = functionDecl;
                 }
@@ -113 +113 @@
                 if ( pvt_decl || ! structDecl->has_body() ) {
                         return;
-                } else if ( structDecl->get_name() == "__cfa__parent_vtable" ) {
+                } else if ( structDecl->get_name() == "__cfavir_type_info" ) {
                         pvt_decl = structDecl;
                 }

src/Virtual/Tables.cc

@@ -172 +172 @@
 }
 
-Attribute * linkonce( const std::string & subsection ) {
-        const std::string section = ".gnu.linkonce." + subsection;
-        return new Attribute( "section", {
-                new ConstantExpr( Constant::from_string( section ) ),
-        } );
-}
-
 ObjectDecl * makeTypeIdInstance( StructInstType const * typeIdType ) {
         assert( typeIdType );
@@ -193 +186 @@
                         new AddressExpr( new NameExpr( "__cfatid_exception_t" ) )
                         ) } ),
-                { linkonce( typeid_name ) },
+                { new Attribute( "cfa_linkonce", {} ) },
                 noFuncSpecifiers
         );