Changeset 22cad76 for src

Timestamp:

Jun 28, 2016, 5:28:45 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

66999e7

Parents:

466149d

git-author:

Aaron Moss <a3moss@…> (06/27/16 16:36:52)

git-committer:

Aaron Moss <a3moss@…> (06/28/16 17:28:45)

Message:

Second attempt to break resolver loop

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -411 +411 @@
         }
 
-        /// Map of declarations (intended to be the assertions in an AssertionSet) to their parents and the number of times they've been included
-        typedef std::unordered_map< DeclarationWithType*, std::unordered_map< DeclarationWithType*, unsigned > > AssertionParentSet;
+        /// Map of declaration uniqueIds (intended to be the assertions in an AssertionSet) to their parents and the number of times they've been included
+        typedef std::unordered_map< UniqueId, std::unordered_map< UniqueId, unsigned > > AssertionParentSet;
         
         static const int recursionLimit = 10;  ///< Limit to depth of recursion satisfaction
@@ -464 +464 @@
                                 std::cerr << std::endl;
                         )
-                        AssertionParentSet newNeedParents( needParents );
-                        // skip repeatingly-self-recursive assertion satisfaction
-                        if ( newNeedParents[ curDecl ][ *candidate ]++ > recursionParentLimit ) return;
                         
                         AssertionSet newHave, newerNeed( newNeed );
@@ -490 +487 @@
                                 newerAlt.env = newEnv;
                                 assert( (*candidate)->get_uniqueId() );
-                                Expression *varExpr = new VariableExpr( static_cast< DeclarationWithType* >( Declaration::declFromId( (*candidate)->get_uniqueId() ) ) );
+                                DeclarationWithType *candDecl = static_cast< DeclarationWithType* >( Declaration::declFromId( (*candidate)->get_uniqueId() ) );
+                                AssertionParentSet newNeedParents( needParents );
+                                // skip repeatingly-self-recursive assertion satisfaction
+                                if ( newNeedParents[ curDecl->get_uniqueId() ][ candDecl->get_uniqueId() ]++ > recursionParentLimit ) continue;
+                                Expression *varExpr = new VariableExpr( candDecl );
                                 deleteAll( varExpr->get_results() );
                                 varExpr->get_results().clear();