Changes in src/ResolvExpr/Resolver.cc [7ff3e522:954c954]

File:

• src/ResolvExpr/Resolver.cc (modified) (9 diffs)

src/ResolvExpr/Resolver.cc

@@ -38 +38 @@
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError
+#include "Common/Stats/ResolveTime.h"    // for ResolveTime::start(), ResolveTime::stop()
 #include "Common/utility.h"              // for ValueGuard, group_iterate
 #include "InitTweak/GenInit.h"
@@ -965 +966 @@
                 /// Finds deleted expressions in an expression tree
                 struct DeleteFinder_new final : public ast::WithShortCircuiting {
-                        const ast::DeletedExpr * delExpr = nullptr;
+                        const ast::DeletedExpr * result = nullptr;
 
                         void previsit( const ast::DeletedExpr * expr ) {
-                                if ( delExpr ) { visit_children = false; }
-                                else { delExpr = expr; }
+                                if ( result ) { visit_children = false; }
+                                else { result = expr; }
                         }
 
                         void previsit( const ast::Expr * ) {
-                                if ( delExpr ) { visit_children = false; }
+                                if ( result ) { visit_children = false; }
                         }
                 };
@@ -980 +981 @@
         /// Check if this expression is or includes a deleted expression
         const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr ) {
-                ast::Pass<DeleteFinder_new> finder;
-                expr->accept( finder );
-                return finder.core.delExpr;
+                return ast::Pass<DeleteFinder_new>::read( expr );
         }
 
@@ -1171 +1170 @@
                         const ast::Expr * untyped, const ast::SymbolTable & symtab
                 ) {
-                        return findKindExpression( untyped, symtab );
+                        Stats::ResolveTime::start( untyped );
+                        auto res = findKindExpression( untyped, symtab );
+                        Stats::ResolveTime::stop();
+                        return res;
                 }
         } // anonymous namespace
@@ -1221 +1223 @@
                 template<typename Iter>
                 inline bool nextMutex( Iter & it, const Iter & end ) {
-                        while ( it != end && ! (*it)->get_type()->is_mutex() ) { ++it; }
+                        while ( it != end && ! (*it)->is_mutex() ) { ++it; }
                         return it != end;
                 }
@@ -1261 +1263 @@
                 const ast::ThrowStmt *       previsit( const ast::ThrowStmt * );
                 const ast::CatchStmt *       previsit( const ast::CatchStmt * );
+                const ast::CatchStmt *       postvisit( const ast::CatchStmt * );
                 const ast::WaitForStmt *     previsit( const ast::WaitForStmt * );
 
@@ -1493 +1496 @@
 
         const ast::CatchStmt * Resolver_new::previsit( const ast::CatchStmt * catchStmt ) {
-                // TODO: This will need a fix for the decl/cond scoping problem.
+                // Until we are very sure this invarent (ifs that move between passes have thenPart)
+                // holds, check it. This allows a check for when to decode the mangling.
+                if ( auto ifStmt = catchStmt->body.as<ast::IfStmt>() ) {
+                        assert( ifStmt->thenPart );
+                }
+                // Encode the catchStmt so the condition can see the declaration.
                 if ( catchStmt->cond ) {
-                        ast::ptr< ast::Type > boolType = new ast::BasicType{ ast::BasicType::Bool };
-                        catchStmt = ast::mutate_field(
-                                catchStmt, &ast::CatchStmt::cond,
-                                findSingleExpression( catchStmt->cond, boolType, symtab ) );
+                        ast::CatchStmt * stmt = mutate( catchStmt );
+                        stmt->body = new ast::IfStmt( stmt->location, stmt->cond, nullptr, stmt->body );
+                        stmt->cond = nullptr;
+                        return stmt;
+                }
+                return catchStmt;
+        }
+
+        const ast::CatchStmt * Resolver_new::postvisit( const ast::CatchStmt * catchStmt ) {
+                // Decode the catchStmt so everything is stored properly.
+                const ast::IfStmt * ifStmt = catchStmt->body.as<ast::IfStmt>();
+                if ( nullptr != ifStmt && nullptr == ifStmt->thenPart ) {
+                        assert( ifStmt->cond );
+                        assert( ifStmt->elsePart );
+                        ast::CatchStmt * stmt = ast::mutate( catchStmt );
+                        stmt->cond = ifStmt->cond;
+                        stmt->body = ifStmt->elsePart;
+                        // ifStmt should be implicately deleted here.
+                        return stmt;
                 }
                 return catchStmt;
@@ -1615 +1638 @@
                                                                 // Check if the argument matches the parameter type in the current
                                                                 // scope
-                                                                ast::ptr< ast::Type > paramType = (*param)->get_type();
+                                                                // ast::ptr< ast::Type > paramType = (*param)->get_type();
                                                                 if (
                                                                         ! unify(
-                                                                                arg->expr->result, paramType, resultEnv, need, have, open,
+                                                                                arg->expr->result, *param, resultEnv, need, have, open,
                                                                                 symtab )
                                                                 ) {
@@ -1625 +1648 @@
                                                                         ss << "candidate function not viable: no known conversion "
                                                                                 "from '";
-                                                                        ast::print( ss, (*param)->get_type() );
+                                                                        ast::print( ss, *param );
                                                                         ss << "' to '";
                                                                         ast::print( ss, arg->expr->result );