Changes in src/Virtual/Tables.cc [b583113:69c5c00]

File:

• src/Virtual/Tables.cc (modified) (8 diffs)

src/Virtual/Tables.cc

@@ -10 +10 @@
 // Created On       : Mon Aug 31 11:11:00 2020
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Apr 21 15:36:00 2021
-// Update Count     : 2
+// Last Modified On : Tue Sep  3 14:56:00 2020
+// Update Count     : 0
 //
 
@@ -22 +22 @@
 namespace Virtual {
 
-std::string typeIdType( std::string const & type_name ) {
-        return "__cfatid_struct_" + type_name;
-}
-
-std::string typeIdName( std::string const & type_name ) {
-        return "__cfatid_" + type_name;
-}
-
-static std::string typeIdTypeToInstance( std::string const & type_name ) {
-        return typeIdName(type_name.substr(16));
-}
-
 std::string vtableTypeName( std::string const & name ) {
         return name + "_vtable";
-}
-
-std::string baseTypeName( std::string const & vtable_type_name ) {
-        return vtable_type_name.substr(0, vtable_type_name.size() - 7);
 }
 
@@ -50 +34 @@
 }
 
-std::string concurrentDefaultVTableName() {
-        return "_default_vtable";
-}
-
 bool isVTableInstanceName( std::string const & name ) {
         // There are some delicate length calculations here.
@@ -61 +41 @@
 
 static ObjectDecl * makeVtableDeclaration(
-                std::string const & name,
                 StructInstType * type, Initializer * init ) {
+        std::string const & name = instanceName( type->name );
         Type::StorageClasses storage = noStorageClasses;
         if ( nullptr == init ) {
@@ -77 +57 @@
 }
 
-ObjectDecl * makeVtableForward( std::string const & name, StructInstType * type ) {
+ObjectDecl * makeVtableForward( StructInstType * type ) {
         assert( type );
-        return makeVtableDeclaration( name, type, nullptr );
+        return makeVtableDeclaration( type, nullptr );
 }
 
 ObjectDecl * makeVtableInstance(
-                std::string const & name, StructInstType * vtableType,
-                Type * objectType, Initializer * init ) {
+                StructInstType * vtableType, Type * objectType, Initializer * init ) {
         assert( vtableType );
         assert( objectType );
@@ -102 +81 @@
                                 inits.push_back(
                                                 new SingleInit( new AddressExpr( new NameExpr( parentInstance ) ) ) );
-                        } else if ( std::string( "__cfavir_typeid" ) == field->name ) {
-                                std::string const & baseType = baseTypeName( vtableType->name );
-                                std::string const & typeId = typeIdName( baseType );
-                                inits.push_back( new SingleInit( new AddressExpr( new NameExpr( typeId ) ) ) );
                         } else if ( std::string( "size" ) == field->name ) {
                                 inits.push_back( new SingleInit( new SizeofExpr( objectType->clone() ) ) );
@@ -120 +95 @@
                 assert(false);
         }
-        return makeVtableDeclaration( name, vtableType, init );
+        return makeVtableDeclaration( vtableType, init );
 }
 
@@ -172 +147 @@
 }
 
-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 );
-        StructInstType * type = typeIdType->clone();
-        type->tq.is_const = true;
-        std::string const & typeid_name = typeIdTypeToInstance( typeIdType->name );
-        return new ObjectDecl(
-                typeid_name,
-                noStorageClasses,
-                LinkageSpec::Cforall,
-                /* bitfieldWidth */ nullptr,
-                type,
-                new ListInit( { new SingleInit(
-                        new AddressExpr( new NameExpr( "__cfatid_exception_t" ) )
-                        ) } ),
-                { linkonce( typeid_name ) },
-                noFuncSpecifiers
-        );
-}
-
-}