Changeset b910d15

Timestamp:

Jun 17, 2019, 3:55:21 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

e6faef4

Parents:

6e55240

Message:

Implemented new versions of Tuples/Explode?.

Location:

src

Files:

• Makefile.in (modified) (6 diffs)
• Tuples/Explode.cc (modified) (2 diffs)
• Tuples/Explode.h (modified) (2 diffs)
• Tuples/Tuples.cc (added)
• Tuples/Tuples.h (modified) (2 diffs)
• Tuples/module.mk (modified) (1 diff)

src/Makefile.in

@@ -239 +239 @@
         $(am__objects_7) Tuples/TupleAssignment.$(OBJEXT) \
         Tuples/TupleExpansion.$(OBJEXT) Tuples/Explode.$(OBJEXT) \
-        Validate/HandleAttributes.$(OBJEXT) \
+        Tuples/Tuples.$(OBJEXT) Validate/HandleAttributes.$(OBJEXT) \
         Validate/FindSpecialDecls.$(OBJEXT)
 am_libdemangle_a_OBJECTS = $(am__objects_8)
@@ -270 +270 @@
         Tuples/TupleAssignment.$(OBJEXT) \
         Tuples/TupleExpansion.$(OBJEXT) Tuples/Explode.$(OBJEXT) \
-        Validate/HandleAttributes.$(OBJEXT) \
+        Tuples/Tuples.$(OBJEXT) Validate/HandleAttributes.$(OBJEXT) \
         Validate/FindSpecialDecls.$(OBJEXT) \
         Virtual/ExpandCasts.$(OBJEXT)
@@ -561 +561 @@
         $(SRC_RESOLVEXPR) ResolvExpr/AlternativePrinter.cc \
         $(SRC_SYMTAB) $(SRC_SYNTREE) Tuples/TupleAssignment.cc \
-        Tuples/TupleExpansion.cc Tuples/Explode.cc \
+        Tuples/TupleExpansion.cc Tuples/Explode.cc Tuples/Tuples.cc \
         Validate/HandleAttributes.cc Validate/FindSpecialDecls.cc \
         Virtual/ExpandCasts.cc
@@ -570 +570 @@
         $(SRC_SYMTAB) SymTab/Demangle.cc $(SRC_SYNTREE) \
         Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc \
-        Tuples/Explode.cc Validate/HandleAttributes.cc \
-        Validate/FindSpecialDecls.cc
+        Tuples/Explode.cc Tuples/Tuples.cc \
+        Validate/HandleAttributes.cc Validate/FindSpecialDecls.cc
 MAINTAINERCLEANFILES = ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
 MOSTLYCLEANFILES = Parser/lex.cc Parser/parser.cc Parser/parser.hh \
@@ -1030 +1030 @@
         Tuples/$(DEPDIR)/$(am__dirstamp)
 Tuples/Explode.$(OBJEXT): Tuples/$(am__dirstamp) \
+        Tuples/$(DEPDIR)/$(am__dirstamp)
+Tuples/Tuples.$(OBJEXT): Tuples/$(am__dirstamp) \
         Tuples/$(DEPDIR)/$(am__dirstamp)
 Validate/$(am__dirstamp):
@@ -1340 +1342 @@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/TupleAssignment.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/TupleExpansion.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/Tuples.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/FindSpecialDecls.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/HandleAttributes.Po@am__quote@

src/Tuples/Explode.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Wed Nov 9 13:12:24 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Nov 9 13:20:24 2016
-// Update Count     : 2
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 12 16:40:00 2016
+// Update Count     : 3
 //
 
@@ -106 +106 @@
                 return expr;
         }
+
+namespace {
+
+// Remove one level of reference from a reference type.
+const ast::Type * getReferenceBase( const ast::Type * t ) {
+        if ( const ast::ReferenceType * ref = dynamic_cast< const ast::ReferenceType * >( t ) ) {
+                return ref->base;
+        } else {
+                assertf( false, "getReferenceBase for non-ref: %s", toString( t ).c_str() );
+                return nullptr;
+        }
+}
+
+struct CastExploderCore {
+        bool castAdded = false;
+        bool foundUniqueExpr = false;
+        const ast::Expr * applyCast( const ast::Expr * expr, bool first = true ) {
+                // On tuple push the cast down.
+                if ( const ast::TupleExpr * tupleExpr = dynamic_cast< const ast::TupleExpr * >( expr ) ) {
+                        foundUniqueExpr = true;
+                        std::vector< ast::ptr< ast::Expr > > exprs;
+                        for ( const ast::Expr * expr : tupleExpr->exprs ) {
+                                exprs.emplace_back( applyCast( expr, false ) );
+                                //exprs.emplace_back( ast::ptr< ast::Expr >( applyCast( expr, false ) ) );
+                        }
+                        if ( first ) {
+                                castAdded = true;
+                                const ast::Expr * tuple = new ast::TupleExpr(
+                                        tupleExpr->location, std::move( exprs ) );
+                                return new ast::CastExpr( tuple->location,
+                                        tuple, new ast::ReferenceType( tuple->result.get(), ast::CV::Qualifiers() ) );
+                        } else {
+                                return new ast::TupleExpr( tupleExpr->location, std::move( exprs ) );
+                        }
+                }
+                if ( dynamic_cast< const ast::ReferenceType * >( expr->result.get() ) ) {
+                        return expr;
+                } else {
+                        castAdded = true;
+                        return new ast::CastExpr( expr->location, expr,
+                                new ast::ReferenceType( expr->result, ast::CV::Qualifiers() ) );
+                }
+        }
+
+        const ast::Expr * postmutate( const ast::UniqueExpr * node ) {
+                // move cast into unique expr so that the unique expr has type T& rather than
+                // type T. In particular, this transformation helps with generating the
+                // correct code for reference-cast member tuple expressions, since the result
+                // should now be a tuple of references rather than a reference to a tuple.
+                // Still, this code is a bit awkward, and could use some improvement.
+                const ast::UniqueExpr * newNode = new ast::UniqueExpr( node->location,
+                                applyCast( node->expr ), node->id );
+                if ( castAdded ) {
+                        // if a cast was added by applyCast, then unique expr now has one more layer of reference
+                        // than it had coming into this function. To ensure types still match correctly, need to cast
+                        //  to reference base so that outer expressions are still correct.
+                        castAdded = false;
+                        const ast::Type * newType = getReferenceBase( newNode->result );
+                        return new ast::CastExpr( newNode->location, node, newType );
+                }
+                return newNode;
+        }
+
+        const ast::Expr * postmutate( const ast::TupleIndexExpr * tupleExpr ) {
+                // tuple index expr needs to be rebuilt to ensure that the type of the
+                // field is consistent with the type of the tuple expr, since the field
+                // may have changed from type T to T&.
+                return new ast::TupleIndexExpr( tupleExpr->location, tupleExpr->tuple, tupleExpr->index );
+        }
+};
+
+} // namespace
+
+const ast::Expr * distributeReference( const ast::Expr * expr ) {
+        ast::Pass<CastExploderCore> exploder;
+        expr = expr->accept( exploder );
+        if ( ! exploder.pass.foundUniqueExpr ) {
+                expr = new ast::CastExpr( expr->location, expr,
+                        new ast::ReferenceType( expr->result, ast::CV::Qualifiers() ) );
+        }
+        return expr;
+}
+
 } // namespace Tuples
 

src/Tuples/Explode.h

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Wed Nov 9 13:12:24 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:55:16 2017
-// Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun 17 14:36:00 2019
+// Update Count     : 4
 //
 
@@ -138 +138 @@
         }
 
+const ast::Expr * distributeReference( const ast::Expr * );
+
+/// Append candidate to an OutputIterator of Candidates.
+template<typename OutputIterator>
+void append( OutputIterator out, const ast::Expr * expr, const ast::TypeEnvironment & env,
+                const ast::OpenVarSet & open, const ast::AssertionList & need,
+                const ResolvExpr::Cost & cost, const ResolvExpr::Cost & cvtCost ) {
+        ast::TypeEnvironment copyEnv = env;
+        ast::OpenVarSet copyOpen = open;
+        ast::AssertionSet set;
+        mergeAssertionSet( set, need );
+        *out++ = std::make_shared<ResolvExpr::Candidate>( expr, std::move( copyEnv ),
+                std::move( copyOpen ), std::move( set ), cost, cvtCost );
+}
+
+/// Append candidate to an ExplodedArg.
+static inline void append( ResolvExpr::ExplodedArg& ea, const ast::Expr * expr,
+                const ast::TypeEnvironment&, const ast::OpenVarSet&,
+                const ast::AssertionList&, const ResolvExpr::Cost&, const ResolvExpr::Cost& ) {
+        // I'm not sure why most of the arguments are unused. But they were in the old version.
+        ea.exprs.emplace_back( expr );
+}
+
+/// Check if the expression is a cast to a reference type, return it if it is.
+static inline const ast::CastExpr * isReferenceCast( const ast::Expr * expr ) {
+        if ( const ast::CastExpr * cast = dynamic_cast< const ast::CastExpr * >( expr ) ) {
+                if ( dynamic_cast< const ast::ReferenceType * >( cast->result.get() ) ) {
+                        return cast;
+                }
+        }
+        return nullptr;
+}
+
+/// helper function (indirectely) used by explode
+template< typename Output >
+void explodeRecursive(
+        const ast::CastExpr * expr, const ResolvExpr::Candidate & arg,
+        const ast::SymbolTable & symtab, Output && out
+) {
+}
+
 /// helper function used by explode
 template< typename Output >
-void explodeUnique( 
-        const ast::Expr * expr, const ResolvExpr::Candidate & arg, const ast::SymbolTable & symtab, 
-        Output && out, bool isTupleAssign
+void explodeUnique(
+        const ast::ptr< ast::Expr > & expr, const ResolvExpr::Candidate & arg,
+        const ast::SymbolTable & symtab, Output && out, bool isTupleAssign
 ) {
-        #warning unimplemented
-        (void)expr; (void)arg; (void)symtab; (void)out; (void)isTupleAssign;
-        assert(false);
+        // Tuple assignment can use a faster method if it is cast. Uses recursive exploding.
+        if ( isTupleAssign ) if ( const ast::CastExpr * castExpr = isReferenceCast( expr ) ) {
+                ResolvExpr::CandidateList candidates;
+                explodeUnique( castExpr->arg, arg, symtab, back_inserter( candidates ), true );
+                for ( ResolvExpr::CandidateRef & cand : candidates ) {
+                        // Distribute the reference cast over all components of the candidate.
+                        append( std::forward<Output>(out), distributeReference( cand->expr ), cand->env,
+                                cand->open, cand->need, cand->cost, cand->cvtCost );
+                }
+                return;
+        }
+        const ast::Type * res = expr->result->stripReferences();
+        if ( const ast::TupleType * tupleType = dynamic_cast< const ast::TupleType * >( res ) ) {
+                if ( const ast::ptr< ast::TupleExpr > & tupleExpr = expr.as< ast::TupleExpr >() ) {
+                        // Open the tuple expr and continue on its components.
+                        for ( const ast::Expr * expr : tupleExpr->exprs ) {
+                                explodeUnique( expr, arg, symtab, std::forward<Output>(out), isTupleAssign );
+                        }
+                } else {
+                        ast::ptr< ast::Expr > local = expr;
+                        // Expressions which may have side effects require a single unique instance.
+                        if ( Tuples::maybeImpureIgnoreUnique( local ) ) {
+                                local = new ast::UniqueExpr( local->location, local );
+                        }
+                        // Cast a reference away to a value-type to allow further explosion.
+                        if ( dynamic_cast< const ast::ReferenceType *>( local->result.get() ) ) {
+                                local = new ast::CastExpr( local->location, local, tupleType );
+                        }
+                        // Now we have to go across the tuple via indexing.
+                        for ( unsigned int i = 0 ; i < tupleType->size() ; ++i ) {
+                                ast::TupleIndexExpr * idx = new ast::TupleIndexExpr( local->location, local, i );
+                                explodeUnique( idx, arg, symtab, std::forward<Output>(out), isTupleAssign );
+                                // TODO: We need more input to figure out the exact lifetimes of these types.
+                                // delete idx;
+                        }
+                        // delete local;
+                }
+        } else {
+                // For atomic/non-tuple types, no explosion is used.
+                append( std::forward<Output>(out), expr, arg.env, arg.open, arg.need, arg.cost,
+                        arg.cvtCost );
+        }
 }
 
 /// expands a tuple-valued candidate into multiple candidates, each with a non-tuple type
 template< typename Output >
-void explode( 
-        const ResolvExpr::Candidate & arg, const ast::SymbolTable & symtab, Output && out, 
+void explode(
+        const ResolvExpr::Candidate & arg, const ast::SymbolTable & symtab, Output && out,
         bool isTupleAssign = false
 ) {

src/Tuples/Tuples.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:55:00 2017
-// Update Count     : 16
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 12 10:39:00 2017
+// Update Count     : 17
 //
 
@@ -57 +57 @@
         bool maybeImpure( Expression * expr );
 
-        /// returns true if the expression may contain side-effect, ignoring the presence of unique expressions.
+        /// Returns true if the expression may contain side-effect,
+        /// ignoring the presence of unique expressions.
         bool maybeImpureIgnoreUnique( Expression * expr );
+        bool maybeImpureIgnoreUnique( const ast::Expr * expr );
 } // namespace Tuples
 

src/Tuples/module.mk

@@ -15 +15 @@
 ###############################################################################
 
-SRC += Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc Tuples/Explode.cc
-SRCDEMANGLE += Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc Tuples/Explode.cc
+SRC += Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc Tuples/Explode.cc \
+        Tuples/Tuples.cc
+SRCDEMANGLE += Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc Tuples/Explode.cc \
+        Tuples/Tuples.cc