Changeset ed1a6374 for src/ResolvExpr/RenameVars.cc

Timestamp:

Jan 5, 2021, 2:51:58 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

f03209d3

Parents:

c4241b6 (diff), 95eec2c (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

@@ -186 +186 @@
 }
 
-const ast::Type * renameTyVars( const ast::Type * t, RenameMode mode ) {
+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;
-        if (mode == GEN_USAGE) {
+        if (mode == GEN_USAGE && reset) {
                 renaming.nextUsage();
         }
@@ -198 +198 @@
 void resetTyVarRenaming() {
         renaming.reset();
+        renaming.nextUsage();
 }