Changeset 6f81db3

Timestamp:

Apr 13, 2018, 5:00:24 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

24de7b1

Parents:

04570c7

Message:

Improve memory usage of earlier AlternativeFinder? stack allocation fix

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (4 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, Expression * member );
+                template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, const std::string & name );
                 /// 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 );
@@ -306 +306 @@
 
                 if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->get_result() ) ) {
-                        addAggMembers( structInst, aggrExpr, alt.cost+Cost::safe, alt.env, new NameExpr("") );
+                        addAggMembers( structInst, aggrExpr, alt.cost+Cost::safe, alt.env, "" );
                 } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->get_result() ) ) {
-                        addAggMembers( unionInst, aggrExpr, alt.cost+Cost::safe, alt.env, new NameExpr("") );
+                        addAggMembers( unionInst, aggrExpr, alt.cost+Cost::safe, alt.env, "" );
                 } // if
         }
 
         template< typename StructOrUnionType >
-        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->get_name();
+        void AlternativeFinder::Finder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, const std::string & name ) {
                 std::list< Declaration* > members;
                 aggInst->lookup( name, members );
@@ -1335 +1331 @@
         }
 
+        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 );
@@ -1346 +1351 @@
                         // find member of the given type
                         if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->get_result() ) ) {
-                                addAggMembers( structInst, aggrExpr, cost, agg->env, memberExpr->get_member() );
+                                addAggMembers( structInst, aggrExpr, cost, agg->env, get_member_name(memberExpr) );
                         } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->get_result() ) ) {
-                                addAggMembers( unionInst, aggrExpr, cost, agg->env, memberExpr->get_member() );
+                                addAggMembers( unionInst, aggrExpr, cost, agg->env, get_member_name(memberExpr) );
                         } else if ( TupleType * tupleType = dynamic_cast< TupleType * >( aggrExpr->get_result() ) ) {
                                 addTupleMembers( tupleType, aggrExpr, cost, agg->env, memberExpr->get_member() );