Changeset 73a5cadb

Timestamp:

Nov 21, 2017, 3:34:11 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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:

bd4f2e9

Parents:

0872c42

Message:

Fix segfault

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -607 +607 @@
                           expls(move(expls)) {}
                 
+                ArgPack(const ArgPack& o, TypeEnvironment&& env, AssertionSet&& need, AssertionSet&& have, 
+                                OpenVarSet&& openVars, unsigned nextArg, Cost added )
+                        : parent(o.parent), expr(o.expr ? o.expr->clone() : nullptr), cost(o.cost + added), 
+                          env(move(env)), need(move(need)), have(move(have)), openVars(move(openVars)), 
+                          nextArg(nextArg), tupleStart(o.tupleStart), expls() {}
+                          
+
                 // ArgPack(const ArgPack& o)
                 //      : parent(o.parent), expr(o.expr ? o.expr->clone() : nullptr), env(o.env), 
@@ -747 +754 @@
                                                 if ( exploded.empty() ) {
                                                         // skip empty tuple arguments by (near-)cloning parent into next gen
-                                                        results.emplace_back( 
-                                                                results[i].parent, results[i].expr.get(), move(env), 
-                                                                copy(results[i].need), copy(results[i].have), move(openVars), 
-                                                                j + 1, results[i].tupleStart, actual.cost + results[i].cost );
+                                                        results.emplace_back(
+                                                                results[i], move(env), copy(results[i].need), 
+                                                                copy(results[i].have), move(openVars), j + 1, actual.cost );
+                                                        
                                                         continue;
                                                 }
@@ -848 +855 @@
                                 if ( exploded.empty() ) {
                                         // skip empty tuple arguments by (near-)cloning parent into next gen
-                                        results.emplace_back( 
-                                                results[i].parent, results[i].expr.get(), move(env), move(need), 
-                                                move(have), move(openVars), j + 1, results[i].tupleStart, 
-                                                actual.cost + results[i].cost );
+                                        results.emplace_back(
+                                                results[i], move(env), move(need), move(have), move(openVars), j + 1, 
+                                                actual.cost );
+
                                         continue;
                                 }
@@ -995 +1002 @@
                                                         // skip empty tuple arguments by (near-)cloning parent into next gen
                                                         results.emplace_back( 
-                                                                results[i].parent, results[i].expr.get(), move(env), 
-                                                                copy(results[i].need), copy(results[i].have), move(openVars), 
-                                                                j + 1, results[i].tupleStart, actual.cost + results[i].cost );
+                                                                results[i], move(env), copy(results[i].need), 
+                                                                copy(results[i].have), move(openVars), j + 1, actual.cost );
                                                         continue;
                                                 }