Changes in src/ResolvExpr/AlternativeFinder.cc [00ac42e:25fcb84]

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (16 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -102 +102 @@
                 void addAnonConversions( const Alternative & alt );
                 /// Adds alternatives for member expressions, given the aggregate, conversion cost for that aggregate, and name of the member
-                template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, const std::string & name );
+                template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member );
                 /// Adds alternatives for member expressions where the left side has tuple type
                 void addTupleMembers( TupleType * tupleType, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member );
@@ -307 +307 @@
 
                 if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->result ) ) {
-                        addAggMembers( structInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, "" );
+                        NameExpr nameExpr( "" );
+                        addAggMembers( structInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, &nameExpr );
                 } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->result ) ) {
-                        addAggMembers( unionInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, "" );
+                        NameExpr nameExpr( "" );
+                        addAggMembers( unionInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, &nameExpr );
                 } // if
         }
 
         template< typename StructOrUnionType >
-        void AlternativeFinder::Finder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, const std::string & name ) {
+        void AlternativeFinder::Finder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member ) {
+                // by this point, member must be a name expr
+                NameExpr * nameExpr = dynamic_cast< NameExpr * >( member );
+                if ( ! nameExpr ) return;
+                const std::string & name = nameExpr->name;
                 std::list< Declaration* > members;
                 aggInst->lookup( name, members );
 
-                for ( Declaration * decl : members ) {
-                        if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( decl ) ) {
-                                // addAnonAlternatives uses vector::push_back, which invalidates references to existing elements, so
-                                // can't construct in place and use vector::back
-                                Alternative newAlt( new MemberExpr( dwt, expr->clone() ), env, newCost );
-                                renameTypes( newAlt.expr );
-                                addAnonConversions( newAlt ); // add anonymous member interpretations whenever an aggregate value type is seen as a member expression.
-                                alternatives.push_back( std::move(newAlt) );
+                for ( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
+                        if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( *i ) ) {
+                                alternatives.push_back( Alternative( new MemberExpr( dwt, expr->clone() ), env, newCost ) );
+                                renameTypes( alternatives.back().expr );
+                                addAnonConversions( alternatives.back() ); // add anonymous member interpretations whenever an aggregate value type is seen as a member expression.
                         } else {
                                 assert( false );
@@ -466 +469 @@
         }
 
+        // /// Map of declaration uniqueIds (intended to be the assertions in an AssertionSet) to their parents and the number of times they've been included
+        //typedef std::unordered_map< UniqueId, std::unordered_map< UniqueId, unsigned > > AssertionParentSet;
+
         static const int recursionLimit = /*10*/ 4;  ///< Limit to depth of recursion satisfaction
+        //static const unsigned recursionParentLimit = 1;  ///< Limit to the number of times an assertion can recursively use itself
 
         void addToIndexer( AssertionSet &assertSet, SymTab::Indexer &indexer ) {
@@ -477 +484 @@
 
         template< typename ForwardIterator, typename OutputIterator >
-        void inferRecursive( ForwardIterator begin, ForwardIterator end, const Alternative &newAlt, OpenVarSet &openVars, const SymTab::Indexer &decls, const AssertionSet &newNeed, int level, const SymTab::Indexer &indexer, OutputIterator out ) {
+        void inferRecursive( ForwardIterator begin, ForwardIterator end, const Alternative &newAlt, OpenVarSet &openVars, const SymTab::Indexer &decls, const AssertionSet &newNeed, /*const AssertionParentSet &needParents,*/
+                                                 int level, const SymTab::Indexer &indexer, OutputIterator out ) {
                 if ( begin == end ) {
                         if ( newNeed.empty() ) {
@@ -495 +503 @@
                                         printAssertionSet( newNeed, std::cerr, 8 );
                                 )
-                                inferRecursive( newNeed.begin(), newNeed.end(), newAlt, openVars, decls, newerNeed, level+1, indexer, out );
+                                inferRecursive( newNeed.begin(), newNeed.end(), newAlt, openVars, decls, newerNeed, /*needParents,*/ level+1, indexer, out );
                                 return;
                         }
@@ -502 +510 @@
                 ForwardIterator cur = begin++;
                 if ( ! cur->second.isUsed ) {
-                        inferRecursive( begin, end, newAlt, openVars, decls, newNeed, level, indexer, out );
+                        inferRecursive( begin, end, newAlt, openVars, decls, newNeed, /*needParents,*/ level, indexer, out );
                         return; // xxx - should this continue? previously this wasn't here, and it looks like it should be
                 }
@@ -555 +563 @@
                                 }
 
+                                //AssertionParentSet newNeedParents( needParents );
+                                // skip repeatingly-self-recursive assertion satisfaction
+                                // DOESN'T WORK: grandchild nodes conflict with their cousins
+                                //if ( newNeedParents[ curDecl->get_uniqueId() ][ candDecl->get_uniqueId() ]++ > recursionParentLimit ) continue;
+
                                 Expression *varExpr = data.combine( newerAlt.cvtCost );
                                 delete varExpr->get_result();
@@ -572 +585 @@
                                 // XXX: this is a memory leak, but adjType can't be deleted because it might contain assertions
                                 (*inferParameters)[ curDecl->get_uniqueId() ] = ParamEntry( candidate->get_uniqueId(), adjType->clone(), curDecl->get_type()->clone(), varExpr );
-                                inferRecursive( begin, end, newerAlt, newOpenVars, newDecls, newerNeed, level, indexer, out );
+                                inferRecursive( begin, end, newerAlt, newOpenVars, newDecls, newerNeed, /*newNeedParents,*/ level, indexer, out );
                         } else {
                                 delete adjType;
@@ -594 +607 @@
                 addToIndexer( have, decls );
                 AssertionSet newNeed;
+                //AssertionParentSet needParents;
                 PRINT(
                         std::cerr << "env is: " << std::endl;
@@ -600 +614 @@
                 )
 
-                inferRecursive( need.begin(), need.end(), newAlt, openVars, decls, newNeed, 0, indexer, out );
+                inferRecursive( need.begin(), need.end(), newAlt, openVars, decls, newNeed, /*needParents,*/ 0, indexer, out );
 //      PRINT(
 //          std::cerr << "declaration 14 is ";
@@ -1079 +1093 @@
                 AlternativeFinder funcOpFinder( indexer, env );
                 // it's ok if there aren't any defined function ops
-                funcOpFinder.maybeFind( opExpr );
+                funcOpFinder.maybeFind( opExpr);
                 PRINT(
                         std::cerr << "known function ops:" << std::endl;
@@ -1116 +1130 @@
                                         }
                                 } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( func->expr->result->stripReferences() ) ) { // handle ftype (e.g. *? on function pointer)
-                                        if ( const EqvClass *eqvClass = func->env.lookup( typeInst->name ) ) {
-                                                if ( FunctionType *function = dynamic_cast< FunctionType* >( eqvClass->type ) ) {
+                                        EqvClass eqvClass;
+                                        if ( func->env.lookup( typeInst->name, eqvClass ) && eqvClass.type ) {
+                                                if ( FunctionType *function = dynamic_cast< FunctionType* >( eqvClass.type ) ) {
                                                         Alternative newFunc( *func );
                                                         referenceToRvalueConversion( newFunc.expr, newFunc.cost );
@@ -1332 +1347 @@
         }
 
-        namespace {
-                /// Gets name from untyped member expression (member must be NameExpr)
-                const std::string& get_member_name( UntypedMemberExpr *memberExpr ) {
-                        NameExpr * nameExpr = dynamic_cast< NameExpr * >( memberExpr->get_member() );
-                        assert( nameExpr );
-                        return nameExpr->get_name();
-                }
-        }
-
         void AlternativeFinder::Finder::postvisit( UntypedMemberExpr *memberExpr ) {
                 AlternativeFinder funcFinder( indexer, env );
@@ -1353 +1359 @@
                         // find member of the given type
                         if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->get_result() ) ) {
-                                addAggMembers( structInst, aggrExpr, cost, agg->env, get_member_name(memberExpr) );
+                                addAggMembers( structInst, aggrExpr, cost, agg->env, memberExpr->get_member() );
                         } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->get_result() ) ) {
-                                addAggMembers( unionInst, aggrExpr, cost, agg->env, get_member_name(memberExpr) );
+                                addAggMembers( unionInst, aggrExpr, cost, agg->env, memberExpr->get_member() );
                         } else if ( TupleType * tupleType = dynamic_cast< TupleType * >( aggrExpr->get_result() ) ) {
                                 addTupleMembers( tupleType, aggrExpr, cost, agg->env, memberExpr->get_member() );
@@ -1373 +1379 @@
                         Cost cost = Cost::zero;
                         Expression * newExpr = data.combine( cost );
-
-                        // addAnonAlternatives uses vector::push_back, which invalidates references to existing elements, so
-                        // can't construct in place and use vector::back
-                        Alternative newAlt( newExpr, env, Cost::zero, cost );
+                        alternatives.push_back( Alternative( newExpr, env, Cost::zero, cost ) );
                         PRINT(
                                 std::cerr << "decl is ";
@@ -1385 +1388 @@
                                 std::cerr << std::endl;
                         )
-                        renameTypes( newAlt.expr );
-                        addAnonConversions( newAlt ); // add anonymous member interpretations whenever an aggregate value type is seen as a name expression.
-                        alternatives.push_back( std::move(newAlt) );
+                        renameTypes( alternatives.back().expr );
+                        addAnonConversions( alternatives.back() ); // add anonymous member interpretations whenever an aggregate value type is seen as a name expression.
                 } // for
         }