Changeset add7117 for src/ResolvExpr/AlternativeFinder.h

Timestamp:

Sep 10, 2016, 11:08:47 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

5af62f1

Parents:

f5e81d1 (diff), 03e3117 (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 tuples

Conflicts:

src/ResolvExpr/AlternativeFinder.cc
src/ResolvExpr/AlternativeFinder.h

File:

• src/ResolvExpr/AlternativeFinder.h (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.h

@@ -29 +29 @@
           public:
                 AlternativeFinder( const SymTab::Indexer &indexer, const TypeEnvironment &env );
-                void find( Expression *expr, bool adjust = false );
+                void find( Expression *expr, bool adjust = false, bool prune = true );
                 /// Calls find with the adjust flag set; adjustment turns array and function types into equivalent pointer types
-                void findWithAdjustment( Expression *expr );
+                void findWithAdjustment( Expression *expr, bool prune = true );
                 AltList &get_alternatives() { return alternatives; }
 
@@ -66 +66 @@
                 virtual void visit( TupleExpr *tupleExpr );
                 virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr );
+                virtual void visit( ConstructorExpr * ctorExpr );
           public:  // xxx - temporary hack - should make Tuples::TupleAssignment a friend
           /// Runs a new alternative finder on each element in [begin, end)
@@ -74 +75 @@
           private:
                 /// 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, Expression * member );
+                template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member );
                 /// Adds alternatives for offsetof expressions, given the base type and name of the member
                 template< typename StructOrUnionType > void addOffsetof( StructOrUnionType *aggInst, const std::string &name );