Changeset 8a930c03 for src/ResolvExpr/Resolver.cc

Timestamp:

Jun 12, 2023, 12:05:58 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

fec8bd1

Parents:

2b78949 (diff), 38e266ca (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/Resolver.cc (modified) (5 diffs)

src/ResolvExpr/Resolver.cc

@@ -1106 +1106 @@
 
                 /// Removes cast to type of argument (unlike StripCasts, also handles non-generated casts)
-                void removeExtraneousCast( ast::ptr<ast::Expr> & expr, const ast::SymbolTable & symtab ) {
+                void removeExtraneousCast( ast::ptr<ast::Expr> & expr ) {
                         if ( const ast::CastExpr * castExpr = expr.as< ast::CastExpr >() ) {
-                                if ( typesCompatible( castExpr->arg->result, castExpr->result, symtab ) ) {
+                                if ( typesCompatible( castExpr->arg->result, castExpr->result ) ) {
                                         // cast is to the same type as its argument, remove it
                                         swap_and_save_env( expr, castExpr->arg );
@@ -1196 +1196 @@
                 ast::ptr< ast::Expr > castExpr = new ast::CastExpr{ untyped, type };
                 ast::ptr< ast::Expr > newExpr = findSingleExpression( castExpr, context );
-                removeExtraneousCast( newExpr, context.symtab );
+                removeExtraneousCast( newExpr );
                 return newExpr;
         }
@@ -1261 +1261 @@
                 static size_t traceId;
                 Resolver_new( const ast::TranslationGlobal & global ) :
+                        ast::WithSymbolTable(ast::SymbolTable::ErrorDetection::ValidateOnAdd),
                         context{ symtab, global } {}
                 Resolver_new( const ResolveContext & context ) :
@@ -1834 +1835 @@
                                                                 if (
                                                                         ! unify(
-                                                                                arg->expr->result, *param, resultEnv, need, have, open,
-                                                                                symtab )
+                                                                                arg->expr->result, *param, resultEnv, need, have, open )
                                                                 ) {
                                                                         // Type doesn't match
@@ -2041 +2041 @@
                 const ast::Type * initContext = currentObject.getCurrentType();
 
-                removeExtraneousCast( newExpr, symtab );
+                removeExtraneousCast( newExpr );
 
                 // check if actual object's type is char[]