Changeset 0661678 for src

Timestamp:

May 19, 2017, 2:33:38 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

d298e03

Parents:

8905f56

Message:

fix unreachable code warnings

File:

• src/InitTweak/FixInit.cc (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -896 +896 @@
                         Parent::visit( compoundStmt );
 
-                        // add destructors for the current scope that we're exiting
+                        // add destructors for the current scope that we're exiting, unless the last statement is a return, which
+                        // causes unreachable code warnings
                         std::list< Statement * > & statements = compoundStmt->get_kids();
-                        insertDtors( reverseDeclOrder.front().begin(), reverseDeclOrder.front().end(), back_inserter( statements ) );
+                        if ( ! statements.empty() && ! dynamic_cast< ReturnStmt * >( statements.back() ) ) {
+                                insertDtors( reverseDeclOrder.front().begin(), reverseDeclOrder.front().end(), back_inserter( statements ) );
+                        }
                         reverseDeclOrder.pop_front();
                 }