Changeset 63be3387 for src/GenPoly/ScrubTyVars.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/GenPoly/ScrubTyVars.cc (modified) (4 diffs)

src/GenPoly/ScrubTyVars.cc

@@ -20 +20 @@
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
 #include "ScrubTyVars.h"
-#include "SymTab/Mangler.h"             // for mangle, typeMode
+#include "SymTab/Mangler.h"             // for mangleType
 #include "SynTree/Declaration.h"        // for TypeDecl, TypeDecl::Data, Typ...
 #include "SynTree/Expression.h"         // for Expression (ptr only), NameExpr
@@ -195 +195 @@
         }
 
-        auto typeVar = typeVars->find( type->name );
+        auto typeVar = typeVars->find( *type );
         if ( typeVar == typeVars->end() ) {
                 return type;
@@ -227 +227 @@
         if ( dynType ) {
                 return new ast::NameExpr( expr->location,
-                        sizeofName( Mangle::mangle( dynType, Mangle::typeMode() ) ) );
+                        sizeofName( Mangle::mangleType( dynType ) ) );
         } else {
                 return expr;
@@ -237 +237 @@
         if ( dynType ) {
                 return new ast::NameExpr( expr->location,
-                        alignofName( Mangle::mangle( dynType, Mangle::typeMode() ) ) );
+                        alignofName( Mangle::mangleType( dynType ) ) );
         } else {
                 return expr;