Changeset 221c542e for src/ResolvExpr/CandidateFinder.cpp

Timestamp:

Jan 24, 2024, 8:19:18 AM (20 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

64c4b4d

Parents:

bad9c8f (diff), 71b5aad5 (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:software/cfa/cfa-cc

File:

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

src/ResolvExpr/CandidateFinder.cpp

@@ -46 +46 @@
 #include "AST/Type.hpp"
 #include "Common/utility.h"       // for move, copy
+#include "Parser/parserutility.h" // for notZeroExpr
 #include "SymTab/Mangler.h"
 #include "Tuples/Tuples.h"        // for handleTupleAssignment
@@ -1502 +1503 @@
         void Finder::postvisit( const ast::LogicalExpr * logicalExpr ) {
                 CandidateFinder finder1( context, tenv );
-                finder1.find( logicalExpr->arg1, ResolveMode::withAdjustment() );
+                ast::ptr<ast::Expr> arg1 = notZeroExpr( logicalExpr->arg1 );
+                finder1.find( arg1, ResolveMode::withAdjustment() );
                 if ( finder1.candidates.empty() ) return;
 
                 CandidateFinder finder2( context, tenv );
-                finder2.find( logicalExpr->arg2, ResolveMode::withAdjustment() );
+                ast::ptr<ast::Expr> arg2 = notZeroExpr( logicalExpr->arg2 );
+                finder2.find( arg2, ResolveMode::withAdjustment() );
                 if ( finder2.candidates.empty() ) return;
 
@@ -1532 +1535 @@
                 // candidates for condition
                 CandidateFinder finder1( context, tenv );
-                finder1.find( conditionalExpr->arg1, ResolveMode::withAdjustment() );
+                ast::ptr<ast::Expr> arg1 = notZeroExpr( conditionalExpr->arg1 );
+                finder1.find( arg1, ResolveMode::withAdjustment() );
                 if ( finder1.candidates.empty() ) return;