Changes in src/ResolvExpr/CandidateFinder.cpp [9e23b446:b9f8274]

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (4 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -41 +41 @@
 #include "Common/utility.h"       // for move, copy
 #include "SymTab/Mangler.h"
-#include "SymTab/Validate.h"      // for validateType
 #include "Tuples/Tuples.h"        // for handleTupleAssignment
 #include "InitTweak/InitTweak.h"  // for getPointerBase
@@ -1091 +1090 @@
                         assert( toType );
                         toType = resolveTypeof( toType, context );
-                        // toType = SymTab::validateType( castExpr->location, toType, symtab );
                         toType = adjustExprType( toType, tenv, symtab );
 
@@ -1265 +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 ";
@@ -1590 +1580 @@
                                 // calculate target type
                                 const ast::Type * toType = resolveTypeof( initAlt.type, context );
-                                // toType = SymTab::validateType( initExpr->location, toType, symtab );
                                 toType = adjustExprType( toType, tenv, symtab );
                                 // The call to find must occur inside this loop, otherwise polymorphic return