Changeset bd144fd for src/ResolvExpr/Resolver.cc

Timestamp:

Dec 23, 2020, 10:02:57 AM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0536c03, 9bb9545b

Parents:

6797f8f (diff), 2daea42 (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) (1 diff)

src/ResolvExpr/Resolver.cc

@@ -1311 +1311 @@
         }
 
-        ast::ptr< ast::Expr > resolveStmtExpr(
+        const ast::Expr * resolveStmtExpr(
                 const ast::StmtExpr * stmtExpr, const ast::SymbolTable & symtab
         ) {
                 assert( stmtExpr );
                 ast::Pass< Resolver_new > resolver{ symtab };
-                ast::ptr< ast::Expr > ret = stmtExpr;
-                ret = ret->accept( resolver );
-                strict_dynamic_cast< ast::StmtExpr * >( ret.get_and_mutate() )->computeResult();
+                auto ret = mutate(stmtExpr->accept(resolver));
+                strict_dynamic_cast< ast::StmtExpr * >( ret )->computeResult();
                 return ret;
         }