Changeset bb9924c


Ignore:
Timestamp:
Nov 10, 2021, 7:21:57 PM (8 months ago)
Author:
Fangren Yu <f37yu@…>
Branches:
enum, forall-pointer-decay, master, new-ast-unique-expr
Children:
f95634e
Parents:
01d433e
Message:

fix unique expr pass

Location:
src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/AST/Convert.cpp

    r01d433e rbb9924c  
    10411041
    10421042        const ast::Expr * visit( const ast::StmtExpr * node ) override final {
    1043                 auto stmts = node->stmts;
    1044                 // disable sharing between multiple StmtExprs explicitly.
    1045                 // this should no longer be true.
    1046 
    10471043                auto rslt = new StmtExpr(
    1048                         get<CompoundStmt>().accept1(stmts)
     1044                        get<CompoundStmt>().accept1(node->stmts)
    10491045                );
    10501046
    10511047                rslt->returnDecls = get<ObjectDecl>().acceptL(node->returnDecls);
    10521048                rslt->dtors       = get<Expression>().acceptL(node->dtors);
    1053                 if (node->resultExpr) {
    1054                         // this MUST be found by children visit
    1055                         rslt->resultExpr  = strict_dynamic_cast<ExprStmt *>(readonlyCache.at(node->resultExpr));
    1056                 }
     1049
     1050                // is this even used after convert?
     1051                //if (tmp->resultExpr) {
     1052                //      // this MUST be found by children visit
     1053                //      rslt->resultExpr  = strict_dynamic_cast<ExprStmt *>(readonlyCache.at(tmp->resultExpr));
     1054                //}
    10571055
    10581056                auto expr = visitBaseExpr( node, rslt );
  • src/Tuples/TupleExpansionNew.cpp

    r01d433e rbb9924c  
    2222        struct UniqueExprExpander final : public ast::WithDeclsToAdd<> {
    2323                const ast::Expr * postvisit( const ast::UniqueExpr * unqExpr );
    24                 std::map< int, const ast::Expr * > decls; // not vector, because order added may not be increasing order
     24                std::map< int, ast::ptr<ast::Expr> > decls; // not vector, because order added may not be increasing order
    2525        };
    2626} // namespace
     
    3939                if ( ! decls.count( id ) ) {
    4040                        ast::ptr< ast::Expr > assignUnq;
    41                         ast::ptr< ast::VariableExpr > var = unqExpr->var;
     41                        const ast::VariableExpr * var = unqExpr->var;
    4242                        if ( unqExpr->object ) {
    4343                                // an object was generated to represent this unique expression -- it should be added to the list of declarations now
    4444                                declsToAddBefore.push_back( unqExpr->object.as< ast::Decl >() );
    4545                                // deep copy required due to unresolved issues with UniqueExpr
    46                                 assignUnq = ast::UntypedExpr::createAssign( loc, var, ast::deepCopy( unqExpr->expr.get() ) );
     46                                assignUnq = ast::UntypedExpr::createAssign( loc, var, unqExpr->expr );
    4747                        } else {
    48                                 ast::ptr< ast::Expr > expr = unqExpr->expr;
    49                                 ast::ptr< ast::CommaExpr > commaExpr = expr.strict_as< ast::CommaExpr >();
     48                                const auto commaExpr = unqExpr->expr.strict_as< ast::CommaExpr >();
    5049                                assignUnq = commaExpr->arg1;
    5150                        }
     
    6463                }
    6564                //delete unqExpr;
    66                 return decls[id];
     65                return ast::deepCopy(decls[id].get());
    6766        }
    6867} // namespace
Note: See TracChangeset for help on using the changeset viewer.