Changeset 26238c1 for src/InitTweak/InitTweak.cc

Timestamp:

Aug 28, 2017, 2:59:36 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:

234223f, afce1cf

Parents:

2065609 (diff), 1cb758f2 (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/InitTweak/InitTweak.cc (modified) (2 diffs)

src/InitTweak/InitTweak.cc

@@ -418 +418 @@
                         assertf( ! tuple->get_exprs().empty(), "TupleAssignExpr somehow has empty tuple expr." );
                         return getCallArg( tuple->get_exprs().front(), pos );
+                } else if ( ImplicitCopyCtorExpr * copyCtor = dynamic_cast< ImplicitCopyCtorExpr * >( callExpr ) ) {
+                        return getCallArg( copyCtor->callExpr, pos );
                 } else {
                         assertf( false, "Unexpected expression type passed to getCallArg: %s", toString( callExpr ).c_str() );
@@ -450 +452 @@
                         } else if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( func ) ) {
                                 return handleDerefName( appExpr );
+                        } else if ( ConstructorExpr * ctorExpr = dynamic_cast< ConstructorExpr * >( func ) ) {
+                                return funcName( getCallArg( ctorExpr->get_callExpr(), 0 ) );
                         } else {
-                                assertf( false, "Unexpected expression type being called as a function in call expression" );
+                                assertf( false, "Unexpected expression type being called as a function in call expression: %s", toString( func ).c_str() );
                         }
                 }