Changeset ffd0ac2 for src/ResolvExpr

Timestamp:

Jan 30, 2018, 2:04:33 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

42be3c3

Parents:

2e9aed4 (diff), 5a73f0f (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/AlternativeFinder.cc (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -1544 +1544 @@
                 AlternativeFinder firstFinder( indexer, env );
                 firstFinder.findWithAdjustment( logicalExpr->get_arg1() );
+                if ( firstFinder.alternatives.empty() ) return;
+                AlternativeFinder secondFinder( indexer, env );
+                secondFinder.findWithAdjustment( logicalExpr->get_arg2() );
+                if ( secondFinder.alternatives.empty() ) return;
                 for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
-                        AlternativeFinder secondFinder( indexer, first->env );
-                        secondFinder.findWithAdjustment( logicalExpr->get_arg2() );
                         for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
+                                TypeEnvironment compositeEnv;
+                                compositeEnv.simpleCombine( first->env );
+                                compositeEnv.simpleCombine( second->env );
+
                                 LogicalExpr *newExpr = new LogicalExpr( first->expr->clone(), second->expr->clone(), logicalExpr->get_isAnd() );
-                                alternatives.push_back( Alternative( newExpr, second->env, first->cost + second->cost ) );
+                                alternatives.push_back( Alternative( newExpr, compositeEnv, first->cost + second->cost ) );
                         }
                 }
@@ -1558 +1564 @@
                 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 ) ) {
@@ -1601 +1615 @@
                 AlternativeFinder firstFinder( indexer, env );
                 firstFinder.findWithAdjustment( rangeExpr->get_low() );
+                if ( firstFinder.alternatives.empty() ) return;
+                AlternativeFinder secondFinder( indexer, env );
+                secondFinder.findWithAdjustment( rangeExpr->get_high() );
+                if ( secondFinder.alternatives.empty() ) return;
                 for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
-                        AlternativeFinder secondFinder( indexer, first->env );
-                        secondFinder.findWithAdjustment( rangeExpr->get_high() );
                         for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
+                                TypeEnvironment compositeEnv;
+                                compositeEnv.simpleCombine( first->env );
+                                compositeEnv.simpleCombine( second->env );
                                 OpenVarSet openVars;
                                 AssertionSet needAssertions, haveAssertions;
-                                Alternative newAlt( 0, second->env, first->cost + second->cost );
+                                Alternative newAlt( 0, compositeEnv, first->cost + second->cost );
                                 Type* commonType = nullptr;
                                 if ( unify( first->expr->get_result(), second->expr->get_result(), newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {