Changeset 90152a4 for src/Tuples

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

Location:

src/Tuples

Files:

• Explode.h (modified) (7 diffs)
• TupleAssignment.cc (modified) (5 diffs)
• TupleExpansion.cc (modified) (8 diffs)

src/Tuples/Explode.h

@@ -43 +43 @@
         /// Append alternative to an OutputIterator of Alternatives
         template<typename OutputIterator>
-        void append( OutputIterator out, Expression* expr, const ResolvExpr::TypeEnvironment& env, 
+        void append( OutputIterator out, Expression* expr, const ResolvExpr::TypeEnvironment& env,
                         const ResolvExpr::Cost& cost, const ResolvExpr::Cost& cvtCost ) {
                 *out++ = ResolvExpr::Alternative{ expr, env, cost, cvtCost };
@@ -49 +49 @@
 
         /// Append alternative to an ExplodedActual
-        static inline void append( ResolvExpr::ExplodedActual& ea, Expression* expr, 
+        static inline void append( ResolvExpr::ExplodedActual& ea, Expression* expr,
                         const ResolvExpr::TypeEnvironment&, const ResolvExpr::Cost&, const ResolvExpr::Cost& ) {
                 ea.exprs.emplace_back( expr );
@@ -57 +57 @@
         /// helper function used by explode
         template< typename Output >
-        void explodeUnique( Expression * expr, const ResolvExpr::Alternative & alt, 
+        void explodeUnique( Expression * expr, const ResolvExpr::Alternative & alt,
                         const SymTab::Indexer & indexer, Output&& out, bool isTupleAssign ) {
                 if ( isTupleAssign ) {
@@ -63 +63 @@
                         if ( CastExpr * castExpr = isReferenceCast( expr ) ) {
                                 ResolvExpr::AltList alts;
-                                explodeUnique( 
+                                explodeUnique(
                                         castExpr->get_arg(), alt, indexer, back_inserter( alts ), isTupleAssign );
                                 for ( ResolvExpr::Alternative & alt : alts ) {
                                         // distribute reference cast over all components
-                                        append( std::forward<Output>(out), distributeReference( alt.release_expr() ), 
+                                        append( std::forward<Output>(out), distributeReference( alt.release_expr() ),
                                                 alt.env, alt.cost, alt.cvtCost );
                                 }
@@ -108 +108 @@
         /// expands a tuple-valued alternative into multiple alternatives, each with a non-tuple-type
         template< typename Output >
-        void explode( const ResolvExpr::Alternative &alt, const SymTab::Indexer & indexer, 
+        void explode( const ResolvExpr::Alternative &alt, const SymTab::Indexer & indexer,
                         Output&& out, bool isTupleAssign = false ) {
                 explodeUnique( alt.expr, alt, indexer, std::forward<Output>(out), isTupleAssign );
@@ -115 +115 @@
         // explode list of alternatives
         template< typename AltIterator, typename Output >
-        void explode( AltIterator altBegin, AltIterator altEnd, const SymTab::Indexer & indexer, 
+        void explode( AltIterator altBegin, AltIterator altEnd, const SymTab::Indexer & indexer,
                         Output&& out, bool isTupleAssign = false ) {
                 for ( ; altBegin != altEnd; ++altBegin ) {
@@ -123 +123 @@
 
         template< typename Output >
-        void explode( const ResolvExpr::AltList & alts, const SymTab::Indexer & indexer, Output&& out, 
+        void explode( const ResolvExpr::AltList & alts, const SymTab::Indexer & indexer, Output&& out,
                         bool isTupleAssign = false ) {
                 explode( alts.begin(), alts.end(), indexer, std::forward<Output>(out), isTupleAssign );

src/Tuples/TupleAssignment.cc

@@ -154 +154 @@
                                                 lhsAlt.expr = new CastExpr( lhsAlt.expr,
                                                                 new ReferenceType( Type::Qualifiers(),
-                                                                        lhsAlt.expr->get_result()->clone() ) );
+                                                                        lhsAlt.expr->result->clone() ) );
                                         }
 
@@ -231 +231 @@
 
                         ResolvExpr::AlternativeFinder finder{ currentFinder.get_indexer(),
-                                currentFinder.get_environ() };
+                                matcher->compositeEnv };
+
                         try {
                                 finder.findWithAdjustment(*i);
@@ -272 +273 @@
                 // args.push_back( new AddressExpr( new VariableExpr( left ) ) );
                 if ( right ) args.push_back( new VariableExpr( right ) );
-                return new UntypedExpr( new NameExpr( fname ), args );
-        }
-
-        // removes environments from subexpressions within statement exprs, which could throw off later passes like those in Box which rely on PolyMutator.
+                if ( left->type->referenceDepth() > 1 && CodeGen::isConstructor( fname ) ) {
+                        args.front() = new AddressExpr( args.front() );
+                        if ( right ) args.back() = new AddressExpr( args.back() );
+                        return new UntypedExpr( new NameExpr( "?=?" ), args );
+                } else {
+                        return new UntypedExpr( new NameExpr( fname ), args );
+                }
+        }
+
+        // removes environments from subexpressions within statement exprs, which could throw off later passes like those in Box which rely on PolyMutator, and adds the bindings to the compositeEnv
         // xxx - maybe this should happen in alternative finder for every StmtExpr?
-        // xxx - it's possible that these environments could contain some useful information. Maybe the right thing to do is aggregate the environments and pass the aggregate back to be added into the compositeEnv
         struct EnvRemover {
                 void previsit( ExprStmt * stmt ) {
-                        delete stmt->expr->env;
-                        stmt->expr->env = nullptr;
-                }
+                        assert( compositeEnv );
+                        if ( stmt->expr->env ) {
+                                compositeEnv->add( *stmt->expr->env );
+                                delete stmt->expr->env;
+                                stmt->expr->env = nullptr;
+                        }
+                }
+
+                ResolvExpr::TypeEnvironment * compositeEnv = nullptr;
         };
 
         ObjectDecl * TupleAssignSpotter::Matcher::newObject( UniqueName & namer, Expression * expr ) {
                 assert( expr->result && ! expr->get_result()->isVoid() );
-                ObjectDecl * ret = new ObjectDecl( namer.newName(), Type::StorageClasses(), LinkageSpec::Cforall, nullptr, expr->get_result()->clone(), new SingleInit( expr->clone() ) );
+                ObjectDecl * ret = new ObjectDecl( namer.newName(), Type::StorageClasses(), LinkageSpec::Cforall, nullptr, expr->result->clone(), new SingleInit( expr->clone() ) );
                 // if expression type is a reference, don't need to construct anything, a simple initializer is sufficient.
-                if ( ! dynamic_cast< ReferenceType * >( expr->get_result() ) ) {
+                if ( ! dynamic_cast< ReferenceType * >( expr->result ) ) {
                         ConstructorInit * ctorInit = InitTweak::genCtorInit( ret );
-                        ret->set_init( ctorInit );
+                        ret->init = ctorInit;
                         ResolvExpr::resolveCtorInit( ctorInit, spotter.currentFinder.get_indexer() ); // resolve ctor/dtors for the new object
                         PassVisitor<EnvRemover> rm; // remove environments from subexpressions of StmtExprs
+                        rm.pass.compositeEnv = &compositeEnv;
                         ctorInit->accept( rm );
                 }
@@ -306 +319 @@
                 assert( (! lhs.empty() && rhs.size() <= 1) || (lhs.empty() && rhs.empty()) );
 
+                // xxx - may need to split this up into multiple declarations, because potential conversion to references
+                //  probably should not reference local variable - see MultipleAssignMatcher::match
                 ObjectDecl * rtmp = rhs.size() == 1 ? newObject( rhsNamer, rhs.front().expr ) : nullptr;
                 for ( ResolvExpr::Alternative & lhsAlt : lhs ) {
@@ -324 +339 @@
                         std::list< ObjectDecl * > ltmp;
                         std::list< ObjectDecl * > rtmp;
-                        std::transform( lhs.begin(), lhs.end(), back_inserter( ltmp ), [&]( ResolvExpr::Alternative & alt ){
-                                return newObject( lhsNamer, alt.expr );
-                        });
-                        std::transform( rhs.begin(), rhs.end(), back_inserter( rtmp ), [&]( ResolvExpr::Alternative & alt ){
-                                return newObject( rhsNamer, alt.expr );
-                        });
-                        zipWith( ltmp.begin(), ltmp.end(), rtmp.begin(), rtmp.end(), back_inserter(out), [&](ObjectDecl * obj1, ObjectDecl * obj2 ) { return createFunc(spotter.fname, obj1, obj2); } );
+                        for ( auto p : group_iterate( lhs, rhs ) ) {
+                                ResolvExpr::Alternative & lhsAlt = std::get<0>(p);
+                                ResolvExpr::Alternative & rhsAlt = std::get<1>(p);
+                                // convert RHS to LHS type minus one reference -- important for the case where LHS is && and RHS is lvalue, etc.
+                                ReferenceType * lhsType = strict_dynamic_cast<ReferenceType *>( lhsAlt.expr->result );
+                                rhsAlt.expr = new CastExpr( rhsAlt.expr, lhsType->base->clone() );
+                                ObjectDecl * lobj = newObject( lhsNamer, lhsAlt.expr );
+                                ObjectDecl * robj = newObject( rhsNamer, rhsAlt.expr );
+                                out.push_back( createFunc(spotter.fname, lobj, robj) );
+                                ltmp.push_back( lobj );
+                                rtmp.push_back( robj );
+
+                                // resolve the cast expression so that rhsAlt return type is bound by the cast type as needed, and transfer the resulting environment
+                                ResolvExpr::AlternativeFinder finder{ spotter.currentFinder.get_indexer(), compositeEnv };
+                                finder.findWithAdjustment( rhsAlt.expr );
+                                assert( finder.get_alternatives().size() == 1 );
+                                compositeEnv = std::move( finder.get_alternatives().front().env );
+                        }
                         tmpDecls.splice( tmpDecls.end(), ltmp );
                         tmpDecls.splice( tmpDecls.end(), rtmp );

src/Tuples/TupleExpansion.cc

@@ -30 +30 @@
 #include "SynTree/Type.h"         // for Type, Type::Qualifiers, TupleType
 #include "SynTree/Visitor.h"      // for Visitor
+#include "Tuples.h"
 
 class CompoundStmt;
@@ -36 +37 @@
 namespace Tuples {
         namespace {
-                struct MemberTupleExpander final : public Mutator {
-                        typedef Mutator Parent;
-                        using Parent::mutate;
-
-                        virtual Expression * mutate( UntypedMemberExpr * memberExpr ) override;
+                struct MemberTupleExpander final : public WithShortCircuiting, public WithVisitorRef<MemberTupleExpander> {
+                        void premutate( UntypedMemberExpr * ) { visit_children = false; }
+                        Expression * postmutate( UntypedMemberExpr * memberExpr );
                 };
 
@@ -79 +78 @@
 
         void expandMemberTuples( std::list< Declaration * > & translationUnit ) {
-                MemberTupleExpander expander;
+                PassVisitor<MemberTupleExpander> expander;
                 mutateAll( translationUnit, expander );
         }
@@ -109 +108 @@
                                 // construct a new UntypedMemberExpr with the correct structure , and recursively
                                 // expand that member expression.
-                                MemberTupleExpander expander;
-                                UntypedMemberExpr * inner = new UntypedMemberExpr( memberExpr->get_aggregate(), aggr->clone() );
-                                UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( memberExpr->get_member(), inner );
+                                PassVisitor<MemberTupleExpander> expander;
+                                UntypedMemberExpr * inner = new UntypedMemberExpr( memberExpr->aggregate, aggr->clone() );
+                                UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( memberExpr->member, inner );
                                 inner->location = newMemberExpr->location = loc;
-                                memberExpr->set_member(nullptr);
-                                memberExpr->set_aggregate(nullptr);
+                                memberExpr->member = nullptr;
+                                memberExpr->aggregate = nullptr;
                                 delete memberExpr;
                                 return newMemberExpr->acceptMutator( expander );
@@ -126 +125 @@
         }
 
-        Expression * MemberTupleExpander::mutate( UntypedMemberExpr * memberExpr ) {
-                if ( UntypedTupleExpr * tupleExpr = dynamic_cast< UntypedTupleExpr * > ( memberExpr->get_member() ) ) {
-                        Expression * aggr = memberExpr->get_aggregate()->clone()->acceptMutator( *this );
+        Expression * MemberTupleExpander::postmutate( UntypedMemberExpr * memberExpr ) {
+                if ( UntypedTupleExpr * tupleExpr = dynamic_cast< UntypedTupleExpr * > ( memberExpr->member ) ) {
+                        Expression * aggr = memberExpr->aggregate->clone()->acceptMutator( *visitor );
                         // aggregate expressions which might be impure must be wrapped in unique expressions
-                        // xxx - if there's a member-tuple expression nested in the aggregate, this currently generates the wrong code if a UniqueExpr is not used, and it's purely an optimization to remove the UniqueExpr
-                        // if ( Tuples::maybeImpureIgnoreUnique( memberExpr->get_aggregate() ) ) aggr = new UniqueExpr( aggr );
-                        aggr = new UniqueExpr( aggr );
-                        for ( Expression *& expr : tupleExpr->get_exprs() ) {
+                        if ( Tuples::maybeImpureIgnoreUnique( memberExpr->aggregate ) ) aggr = new UniqueExpr( aggr );
+                        for ( Expression *& expr : tupleExpr->exprs ) {
                                 expr = reconstructMemberExpr( expr, aggr, memberExpr->location );
                                 expr->location = memberExpr->location;
@@ -143 +140 @@
                         // there may be a tuple expr buried in the aggregate
                         // xxx - this is a memory leak
-                        UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( memberExpr->get_member()->clone(), memberExpr->get_aggregate()->acceptMutator( *this ) );
+                        UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( memberExpr->member->clone(), memberExpr->aggregate->acceptMutator( *visitor ) );
                         newMemberExpr->location = memberExpr->location;
                         return newMemberExpr;
@@ -202 +199 @@
                         // generate struct type to replace tuple type based on the number of components in the tuple
                         StructDecl * decl = new StructDecl( toString( "_tuple", tupleSize, "_" ) );
+                        decl->location = tupleType->location;
                         decl->set_body( true );
                         for ( size_t i = 0; i < tupleSize; ++i ) {
@@ -228 +226 @@
 
         Expression * TupleIndexExpander::postmutate( TupleIndexExpr * tupleExpr ) {
-                Expression * tuple = tupleExpr->get_tuple();
+                Expression * tuple = tupleExpr->tuple;
                 assert( tuple );
-                tupleExpr->set_tuple( nullptr );
-                unsigned int idx = tupleExpr->get_index();
-                TypeSubstitution * env = tupleExpr->get_env();
-                tupleExpr->set_env( nullptr );
+                tupleExpr->tuple = nullptr;
+                unsigned int idx = tupleExpr->index;
+                TypeSubstitution * env = tupleExpr->env;
+                tupleExpr->env = nullptr;
                 delete tupleExpr;
 
-                StructInstType * type = strict_dynamic_cast< StructInstType * >( tuple->get_result() );
-                StructDecl * structDecl = type->get_baseStruct();
-                assert( structDecl->get_members().size() > idx );
-                Declaration * member = *std::next(structDecl->get_members().begin(), idx);
+                if ( TupleExpr * tupleExpr = dynamic_cast< TupleExpr * > ( tuple ) ) {
+                        if ( ! maybeImpureIgnoreUnique( tupleExpr ) ) {
+                                // optimization: definitely pure tuple expr => can reduce to the only relevant component.
+                                assert( tupleExpr->exprs.size() > idx );
+                                Expression *& expr = *std::next(tupleExpr->exprs.begin(), idx);
+                                Expression * ret = expr;
+                                ret->env = env;
+                                expr = nullptr; // remove from list so it can safely be deleted
+                                delete tupleExpr;
+                                return ret;
+                        }
+                }
+
+                StructInstType * type = strict_dynamic_cast< StructInstType * >( tuple->result );
+                StructDecl * structDecl = type->baseStruct;
+                assert( structDecl->members.size() > idx );
+                Declaration * member = *std::next(structDecl->members.begin(), idx);
                 MemberExpr * memExpr = new MemberExpr( strict_dynamic_cast< DeclarationWithType * >( member ), tuple );
-                memExpr->set_env( env );
+                memExpr->env = env;
                 return memExpr;
         }