Changeset fb57626 for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Dec 18, 2017, 2:27:58 PM (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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

46dfe66

Parents:

b8b075cd (diff), 06088f9a (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -595 +595 @@
 
                 ArgPack()
-                        : parent(0), expr(), cost(Cost::zero), env(), need(), have(), openVars(), nextArg(0),
-
+                        : parent(0), expr(), cost(Cost::zero), env(), need(), have(), openVars(), nextArg(0), 
                           tupleStart(0), nextExpl(0), explAlt(0) {}
 
@@ -706 +705 @@
                                                 Type* argType;
 
-                                                if ( nTuples > 0 ) {
-                                                        // first iteration, push empty tuple expression
+                                                if ( nTuples > 0 || ! results[i].expr ) {
+                                                        // first iteration or no expression to clone, 
+                                                        // push empty tuple expression
                                                         newResult.parent = i;
                                                         std::list<Expression*> emptyList;