Changeset bb9924c

Timestamp:

Nov 10, 2021, 7:21:57 PM (3 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f95634e

Parents:

01d433e

Message:

fix unique expr pass

Location:

src

Files:

• AST/Convert.cpp (modified) (1 diff)
• Tuples/TupleExpansionNew.cpp (modified) (3 diffs)

src/AST/Convert.cpp

@@ -1041 +1041 @@
 
         const ast::Expr * visit( const ast::StmtExpr * node ) override final {
-                auto stmts = node->stmts;
-                // disable sharing between multiple StmtExprs explicitly.
-                // this should no longer be true.
-
                 auto rslt = new StmtExpr(
-                        get<CompoundStmt>().accept1(stmts)
+                        get<CompoundStmt>().accept1(node->stmts)
                 );
 
                 rslt->returnDecls = get<ObjectDecl>().acceptL(node->returnDecls);
                 rslt->dtors       = get<Expression>().acceptL(node->dtors);
-                if (node->resultExpr) {
-                        // this MUST be found by children visit
-                        rslt->resultExpr  = strict_dynamic_cast<ExprStmt *>(readonlyCache.at(node->resultExpr));
-                }
+
+                // is this even used after convert?
+                //if (tmp->resultExpr) {
+                //      // this MUST be found by children visit
+                //      rslt->resultExpr  = strict_dynamic_cast<ExprStmt *>(readonlyCache.at(tmp->resultExpr));
+                //}
 
                 auto expr = visitBaseExpr( node, rslt );

src/Tuples/TupleExpansionNew.cpp

@@ -22 +22 @@
         struct UniqueExprExpander final : public ast::WithDeclsToAdd<> {
                 const ast::Expr * postvisit( const ast::UniqueExpr * unqExpr );
-                std::map< int, const ast::Expr * > decls; // not vector, because order added may not be increasing order
+                std::map< int, ast::ptr<ast::Expr> > decls; // not vector, because order added may not be increasing order
         };
 } // namespace
@@ -39 +39 @@
                 if ( ! decls.count( id ) ) {
                         ast::ptr< ast::Expr > assignUnq;
-                        ast::ptr< ast::VariableExpr > var = unqExpr->var;
+                        const ast::VariableExpr * var = unqExpr->var;
                         if ( unqExpr->object ) {
                                 // an object was generated to represent this unique expression -- it should be added to the list of declarations now
                                 declsToAddBefore.push_back( unqExpr->object.as< ast::Decl >() );
                                 // deep copy required due to unresolved issues with UniqueExpr
-                                assignUnq = ast::UntypedExpr::createAssign( loc, var, ast::deepCopy( unqExpr->expr.get() ) );
+                                assignUnq = ast::UntypedExpr::createAssign( loc, var, unqExpr->expr );
                         } else {
-                                ast::ptr< ast::Expr > expr = unqExpr->expr;
-                                ast::ptr< ast::CommaExpr > commaExpr = expr.strict_as< ast::CommaExpr >();
+                                const auto commaExpr = unqExpr->expr.strict_as< ast::CommaExpr >();
                                 assignUnq = commaExpr->arg1;
                         }
@@ -64 +63 @@
                 }
                 //delete unqExpr;
-                return decls[id];
+                return ast::deepCopy(decls[id].get());
         }
 } // namespace