Changeset c13e8dc8 for src/GenPoly/InstantiateGeneric.cc

Timestamp:

Dec 5, 2017, 2:35:03 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f9feab8

Parents:

9c35431 (diff), 65197c2 (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 cleanup-dtors

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (4 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() );
-                }
         }
 
@@ -469 +460 @@
                 if ( isGenericType( memberExpr->aggregate->result ) ) {
                         // find the location of the member
-                        AggregateDecl * aggr = getAggr( memberExpr->aggregate->result );
+                        AggregateDecl * aggr = memberExpr->aggregate->result->getAggr();
                         std::list< Declaration * > & members = aggr->members;
                         memberIndex = std::distance( members.begin(), std::find( members.begin(), members.end(), memberExpr->member ) );
@@ -479 +470 @@
                 if ( memberIndex != -1 ) {
                         // using the location from the generic type, find the member in the instantiation and rebuild the member expression
-                        AggregateDecl * aggr = getAggr( memberExpr->aggregate->result );
+                        AggregateDecl * aggr = memberExpr->aggregate->result->getAggr();
                         assertf( memberIndex < (int)aggr->members.size(), "Instantiation somehow has fewer members than the generic type." );
                         Declaration * member = *std::next( aggr->members.begin(), memberIndex );
@@ -526 +517 @@
                                         Expression * init = new CastExpr( new AddressExpr( memberExpr ), new PointerType( Type::Qualifiers(), concType->clone() ) );
                                         ObjectDecl * tmp = ObjectDecl::newObject( tmpNamer.newName(), new ReferenceType( Type::Qualifiers(), concType ), new SingleInit( init ) );
-                                        stmtsToAddBefore.push_back( new DeclStmt( noLabels, tmp ) );
+                                        stmtsToAddBefore.push_back( new DeclStmt( tmp ) );
                                         return new VariableExpr( tmp );
                                 } else {