Changeset 6f72453 for src/InitTweak/InitTweak.cc

Timestamp:

Jul 11, 2016, 5:25:12 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

1b8c156, 7d5e243

Parents:

c0588909 (diff), 919d1ba (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) (1 diff)

src/InitTweak/InitTweak.cc

@@ -66 +66 @@
                 } else if ( CompoundStmt * compoundStmt = dynamic_cast< CompoundStmt * >( stmt ) ) {
                         // could also be a compound statement with a loop, in the case of an array
-                        assert( compoundStmt->get_kids().size() == 2 ); // loop variable and loop
-                        ForStmt * forStmt = dynamic_cast< ForStmt * >( compoundStmt->get_kids().back() );
-                        assert( forStmt && forStmt->get_body() );
-                        return getCtorDtorCall( forStmt->get_body() );
+                        if( compoundStmt->get_kids().size() == 2 ) {
+                                // loop variable and loop
+                                ForStmt * forStmt = dynamic_cast< ForStmt * >( compoundStmt->get_kids().back() );
+                                assert( forStmt && forStmt->get_body() );
+                                return getCtorDtorCall( forStmt->get_body() );
+                        } else if ( compoundStmt->get_kids().size() == 1 ) {
+                                // should be the call statement, but in any case there's only one option
+                                return getCtorDtorCall( compoundStmt->get_kids().front() );
+                        } else {
+                                assert( false && "too many statements in compoundStmt for getCtorDtorCall" );
+                        }
                 } if ( ImplicitCtorDtorStmt * impCtorDtorStmt = dynamic_cast< ImplicitCtorDtorStmt * > ( stmt ) ) {
                         return getCtorDtorCall( impCtorDtorStmt->get_callStmt() );