Changeset c935c3a for src/Tuples/TupleExpansion.cc

Timestamp:

Sep 13, 2017, 3:03:32 PM (7 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/Tuples/TupleExpansion.cc (modified) (2 diffs)

src/Tuples/TupleExpansion.cc

@@ -168 +168 @@
                                 // steal the already generated assignment to var from the unqExpr - this has been generated by FixInit
                                 Expression * expr = unqExpr->get_expr();
-                                CommaExpr * commaExpr = safe_dynamic_cast< CommaExpr * >( expr );
+                                CommaExpr * commaExpr = strict_dynamic_cast< CommaExpr * >( expr );
                                 assignUnq = commaExpr->get_arg1();
                                 commaExpr->set_arg1( nullptr );
@@ -237 +237 @@
                 delete tupleExpr;
 
-                StructInstType * type = safe_dynamic_cast< StructInstType * >( tuple->get_result() );
+                StructInstType * type = strict_dynamic_cast< StructInstType * >( tuple->get_result() );
                 StructDecl * structDecl = type->get_baseStruct();
                 assert( structDecl->get_members().size() > idx );
                 Declaration * member = *std::next(structDecl->get_members().begin(), idx);
-                MemberExpr * memExpr = new MemberExpr( safe_dynamic_cast< DeclarationWithType * >( member ), tuple );
+                MemberExpr * memExpr = new MemberExpr( strict_dynamic_cast< DeclarationWithType * >( member ), tuple );
                 memExpr->set_env( env );
                 return memExpr;