Changeset d63eeb0 for src/ResolvExpr/AlternativeFinder.h

Timestamp:

Feb 9, 2016, 3:25:05 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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 ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

File:

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

src/ResolvExpr/AlternativeFinder.h ¶

@@ -56 +56 @@
                 virtual void visit( ConstantExpr *constantExpr ); 
                 virtual void visit( SizeofExpr *sizeofExpr );
-                virtual void visit( AlignofExpr *sizeofExpr );
+                virtual void visit( AlignofExpr *alignofExpr );
+                virtual void visit( UntypedOffsetofExpr *offsetofExpr );
+                virtual void visit( OffsetofExpr *offsetofExpr );
                 virtual void visit( AttrExpr *attrExpr );
                 virtual void visit( LogicalExpr *logicalExpr );
@@ -67 +69 @@
 
           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, const std::string &name );
+                /// 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 );
                 bool instantiateFunction( std::list< DeclarationWithType* >& formals, /*const*/ AltList &actuals, bool isVarArgs, OpenVarSet& openVars, TypeEnvironment &resultEnv, AssertionSet &resultNeed, AssertionSet &resultHave );
                 template< typename OutputIterator >