Changeset def751f for src/ResolvExpr/CandidateFinder.cpp

Timestamp:

Jul 25, 2022, 3:17:25 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

b0d9ff7

Parents:

4e2befe3 (diff), ffec1bf (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' into qualifiedEnum

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (1 diff)

src/ResolvExpr/CandidateFinder.cpp

@@ -1263 +1263 @@
                                         newExpr, copy( tenv ), ast::OpenVarSet{}, ast::AssertionSet{}, Cost::zero,
                                         cost );
+
+                                if (newCand->expr->env) {
+                                        newCand->env.add(*newCand->expr->env);
+                                        auto mutExpr = newCand->expr.get_and_mutate();
+                                        mutExpr->env  = nullptr;
+                                        newCand->expr = mutExpr;
+                                }
+
                                 PRINT(
                                         std::cerr << "decl is ";