Changeset 83ab931

Timestamp:

Dec 10, 2018, 2:47:37 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

9aaacc27

Parents:

40290497

Message:

Fix type renaming issue with deferred resolution

File:

• src/ResolvExpr/ResolveAssertions.cc (modified) (2 diffs)

src/ResolvExpr/ResolveAssertions.cc

@@ -16 +16 @@
 #include "ResolveAssertions.h"
 
-#include <cassert>                // for assertf
-#include <list>                   // for list
-#include <unordered_map>          // for unordered_map, unordered_multimap
-#include <utility>                // for move
-#include <vector>                 // for vector
-
-#include "Alternative.h"          // for Alternative, AssertionItem, AssertionList
-#include "Common/FilterCombos.h"  // for filterCombos
-#include "Common/utility.h"       // for sort_mins
-#include "SymTab/Indexer.h"       // for Indexer
-#include "SynTree/Expression.h"   // for InferredParams
-#include "TypeEnvironment.h"      // for TypeEnvironment, etc.
-#include "typeops.h"              // for adjustExprType
-#include "Unify.h"                // for unify
+#include <cassert>                  // for assertf
+#include <list>                     // for list
+#include <unordered_map>            // for unordered_map, unordered_multimap
+#include <utility>                  // for move
+#include <vector>                   // for vector
+
+#include "Alternative.h"            // for Alternative, AssertionItem, AssertionList
+#include "Common/FilterCombos.h"    // for filterCombos
+#include "Common/utility.h"         // for sort_mins
+#include "ResolvExpr/RenameVars.h"  // for renameTyVars
+#include "SymTab/Indexer.h"         // for Indexer
+#include "SynTree/Expression.h"     // for InferredParams
+#include "TypeEnvironment.h"        // for TypeEnvironment, etc.
+#include "typeops.h"                // for adjustExprType
+#include "Unify.h"                  // for unify
 
 namespace ResolvExpr {
@@ -248 +249 @@
                         Type* adjType = candidate->get_type()->clone();
                         adjustExprType( adjType, newEnv, resn.indexer );
+                        renameTyVars( adjType );
 
                         // keep unifying candidates