Changeset 4789f44 for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Feb 5, 2016, 12:28:21 PM (10 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, string, with_gc

Children:

408d460, bd85400

Parents:

b4cd03b7 (diff), 2a4b088 (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 fix-argument-passing-type-warnings

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -811 +811 @@
         }
 
+        template< typename StructOrUnionType >
+        void AlternativeFinder::addOffsetof( StructOrUnionType *aggInst, const std::string &name ) {
+                std::list< Declaration* > members;
+                aggInst->lookup( name, members );
+                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 OffsetofExpr( aggInst->clone(), dwt->clone() ), env, Cost::zero ) );
+                                renameTypes( alternatives.back().expr );
+                        } else {
+                                assert( false );
+                        }
+                }
+        }
+        
+        void AlternativeFinder::visit( UntypedOffsetofExpr *offsetofExpr ) {
+                AlternativeFinder funcFinder( indexer, env );
+                if ( StructInstType *structInst = dynamic_cast< StructInstType* >( offsetofExpr->get_type() ) ) {
+                        addOffsetof( structInst, offsetofExpr->get_member() );
+                } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( offsetofExpr->get_type() ) ) {
+                        addOffsetof( unionInst, offsetofExpr->get_member() );
+                }
+        }
+        
         void AlternativeFinder::visit( OffsetofExpr *offsetofExpr ) {
                 alternatives.push_back( Alternative( offsetofExpr->clone(), env, Cost::zero ) );