Changeset 04cccaf

Timestamp:

Jul 13, 2018, 11:35:03 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

825170d

Parents:

d53772d

Message:

Terminate assertion resolution early if alternative has infinite cost

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -482 +482 @@
         template< typename ForwardIterator, typename OutputIterator >
         void inferRecursive( ForwardIterator begin, ForwardIterator end, const Alternative &newAlt, OpenVarSet &openVars, const SymTab::Indexer &decls, const AssertionSet &newNeed, int level, const SymTab::Indexer &indexer, OutputIterator out ) {
+                if ( newAlt.cost == Cost::infinity ) return; // don't proceed down this dead end
                 if ( begin == end ) {
                         if ( newNeed.empty() ) {
@@ -1185 +1186 @@
                                 std::cerr << "bindings are:" << std::endl;
                                 withFunc.env.print( std::cerr, 8 );
+                                std::cerr << "cost is: " << withFunc.cost << std::endl;
                                 std::cerr << "cost of conversion is:" << cvtCost << std::endl;
                         )