Changeset c935c3a for src/GenPoly/InstantiateGeneric.cc

Timestamp:

Sep 13, 2017, 3:03:32 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, 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:

ed235b6

Parents:

b2e2e34 (diff), 982832e (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (1 diff)

src/GenPoly/InstantiateGeneric.cc

@@ -459 +459 @@
                         Declaration * member = *std::next( aggr->members.begin(), memberIndex );
                         assertf( member->name == memberExpr->member->name, "Instantiation has different member order than the generic type. %s / %s", toString( member ).c_str(), toString( memberExpr->member ).c_str() );
-                        DeclarationWithType * field = safe_dynamic_cast< DeclarationWithType * >( member );
+                        DeclarationWithType * field = strict_dynamic_cast< DeclarationWithType * >( member );
                         MemberExpr * ret = new MemberExpr( field, memberExpr->aggregate->clone() );
                         std::swap( ret->env, memberExpr->env );