Changeset ebcb7ba

Timestamp:

Jan 29, 2018, 2:05:26 PM (7 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

93967c8, fee651f

Parents:

ff39851

Message:

Refactor AlternativeFinder? handling of ConditionalExpr? to greatly reduce the number of unnecessary recursive calls

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -1558 +1558 @@
                 AlternativeFinder firstFinder( indexer, env );
                 firstFinder.findWithAdjustment( conditionalExpr->get_arg1() );
+                if ( firstFinder.alternatives.empty() ) return;
+                // find alternatives for true expression
+                AlternativeFinder secondFinder( indexer, env );
+                secondFinder.findWithAdjustment( conditionalExpr->get_arg2() );
+                if ( secondFinder.alternatives.empty() ) return;
+                // find alterantives for false expression
+                AlternativeFinder thirdFinder( indexer, env );
+                thirdFinder.findWithAdjustment( conditionalExpr->get_arg3() );
+                if ( thirdFinder.alternatives.empty() ) return;
                 for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
-                        // find alternatives for true expression
-                        AlternativeFinder secondFinder( indexer, first->env );
-                        secondFinder.findWithAdjustment( conditionalExpr->get_arg2() );
                         for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
-                                // find alterantives for false expression
-                                AlternativeFinder thirdFinder( indexer, second->env );
-                                thirdFinder.findWithAdjustment( conditionalExpr->get_arg3() );
                                 for ( AltList::const_iterator third = thirdFinder.alternatives.begin(); third != thirdFinder.alternatives.end(); ++third ) {
+                                        TypeEnvironment compositeEnv;
+                                        compositeEnv.simpleCombine( first->env );
+                                        compositeEnv.simpleCombine( second->env );
+                                        compositeEnv.simpleCombine( third->env );
+
                                         // unify true and false types, then infer parameters to produce new alternatives
                                         OpenVarSet openVars;
                                         AssertionSet needAssertions, haveAssertions;
-                                        Alternative newAlt( 0, third->env, first->cost + second->cost + third->cost );
+                                        Alternative newAlt( 0, compositeEnv, first->cost + second->cost + third->cost );
                                         Type* commonType = nullptr;
                                         if ( unify( second->expr->get_result(), third->expr->get_result(), newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {