Changeset 7878974

Timestamp:

Jan 9, 2023, 4:12:05 PM (22 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

53ef99a

Parents:

2cc969c (diff), f76dd1a (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/ResolvExpr/RenameVars.cc (modified) (2 diffs)

src/ResolvExpr/RenameVars.cc

@@ -83 +83 @@
 
                 const ast::TypeInstType * rename( const ast::TypeInstType * type ) {
-                        // rename
                         auto it = idMap.find( type->name );
-                        if ( it != idMap.end() ) {
-                                // unconditionally mutate because map will *always* have different name
-                                ast::TypeInstType * mut = ast::shallowCopy( type );
-                                // reconcile base node since some copies might have been made
-                                mut->base = it->second.base;
-                                mut->formal_usage = it->second.formal_usage;
-                                mut->expr_id = it->second.expr_id;
-                    type = mut;
-                        }
-
-                        return type;
+                        if ( it == idMap.end() ) return type;
+
+                        // Unconditionally mutate because map will *always* have different name.
+                        ast::TypeInstType * mut = ast::shallowCopy( type );
+                        // Reconcile base node since some copies might have been made.
+                        mut->base = it->second.base;
+                        mut->formal_usage = it->second.formal_usage;
+                        mut->expr_id = it->second.expr_id;
+                        return mut;
                 }
 
@@ -187 +184 @@
 
 const ast::Type * renameTyVars( const ast::Type * t, RenameMode mode, bool reset ) {
-        // ast::Type *tc = ast::deepCopy(t);
         ast::Pass<RenameVars_new> renamer;
         renamer.core.mode = mode;