Changes in src/GenPoly/InstantiateGeneric.cc [373d0b5:4e7a4e6]

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (3 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -453 +453 @@
                         return false;
                 }
+
+                AggregateDecl * getAggr( Type * t ) {
+                        if ( StructInstType * inst = dynamic_cast< StructInstType * >( t ) ) {
+                                return inst->baseStruct;
+                        } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( t ) ) {
+                                return inst->baseUnion;
+                        }
+                        assertf( false, "Non-aggregate type: %s", toString( t ).c_str() );
+                }
         }
 
@@ -460 +469 @@
                 if ( isGenericType( memberExpr->aggregate->result ) ) {
                         // find the location of the member
-                        AggregateDecl * aggr = memberExpr->aggregate->result->getAggr();
+                        AggregateDecl * aggr = getAggr( memberExpr->aggregate->result );
                         std::list< Declaration * > & members = aggr->members;
                         memberIndex = std::distance( members.begin(), std::find( members.begin(), members.end(), memberExpr->member ) );
@@ -470 +479 @@
                 if ( memberIndex != -1 ) {
                         // using the location from the generic type, find the member in the instantiation and rebuild the member expression
-                        AggregateDecl * aggr = memberExpr->aggregate->result->getAggr();
+                        AggregateDecl * aggr = getAggr( memberExpr->aggregate->result );
                         assertf( memberIndex < (int)aggr->members.size(), "Instantiation somehow has fewer members than the generic type." );
                         Declaration * member = *std::next( aggr->members.begin(), memberIndex );