Changeset 63be3387 for src/Virtual/ExpandCasts.cc

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (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/ExpandCasts.cc (modified) (2 diffs)

src/Virtual/ExpandCasts.cc

@@ -295 +295 @@
         // returns the previous declaration for error messages.
         ast::ObjectDecl const * insert( ast::ObjectDecl const * typeIdDecl ) {
-                std::string const & mangledName =
-                                Mangle::mangle( typeIdDecl->type, Mangle::typeMode() );
+                std::string mangledName = Mangle::mangleType( typeIdDecl->type );
                 ast::ObjectDecl const *& value = instances[ mangledName ];
                 if ( value ) {
@@ -310 +309 @@
 
         ast::ObjectDecl const * lookup( ast::Type const * typeIdType ) {
-                std::string const & mangledName =
-                                Mangle::mangle( typeIdType, Mangle::typeMode() );
+                std::string mangledName = Mangle::mangleType( typeIdType );
                 auto const it = instances.find( mangledName );
                 return ( instances.end() == it ) ? nullptr : it->second;