Changeset 578c09a for src/Virtual/Tables.cc

Timestamp:

Apr 23, 2021, 11:53:33 AM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

aaf92de

Parents:

b39e6566 (diff), b583113 (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/Virtual/Tables.cc (modified) (6 diffs)

src/Virtual/Tables.cc

@@ -10 +10 @@
 // Created On       : Mon Aug 31 11:11:00 2020
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Apr  8 15:51:00 2021
-// Update Count     : 1
+// Last Modified On : Wed Apr 21 15:36:00 2021
+// Update Count     : 2
 //
 
@@ -50 +50 @@
 }
 
+std::string concurrentDefaultVTableName() {
+        return "_default_vtable";
+}
+
 bool isVTableInstanceName( std::string const & name ) {
         // There are some delicate length calculations here.
@@ -57 +61 @@
 
 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 ) {
@@ -73 +77 @@
 }
 
-ObjectDecl * makeVtableForward( StructInstType * type ) {
+ObjectDecl * makeVtableForward( std::string const & name, StructInstType * type ) {
         assert( type );
-        return makeVtableDeclaration( type, nullptr );
+        return makeVtableDeclaration( name, type, nullptr );
 }
 
 ObjectDecl * makeVtableInstance(
-                StructInstType * vtableType, Type * objectType, Initializer * init ) {
+                std::string const & name, StructInstType * vtableType,
+                Type * objectType, Initializer * init ) {
         assert( vtableType );
         assert( objectType );
@@ -115 +120 @@
                 assert(false);
         }
-        return makeVtableDeclaration( vtableType, init );
+        return makeVtableDeclaration( name, vtableType, init );
 }
 
@@ -167 +172 @@
 }
 
-ObjectDecl * makeTypeIdForward() {
-        return nullptr;
-}
-
 Attribute * linkonce( const std::string & subsection ) {
         const std::string section = ".gnu.linkonce." + subsection;