Index: pkg/analyzer/lib/src/generated/resolver.dart |
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart |
index 607f438f4dbf357b00af644ff0f1af2e174a1db3..1137ef4a9cf83bfc51d8ace5d305b075d38f72d2 100644 |
--- a/pkg/analyzer/lib/src/generated/resolver.dart |
+++ b/pkg/analyzer/lib/src/generated/resolver.dart |
@@ -2060,22 +2060,44 @@ class DeadCodeVerifier extends RecursiveAstVisitor<Object> { |
/** |
* Given some [NodeList] of [Statement]s, from either a [Block] or |
- * [SwitchMember], this loops through the list in reverse order searching for statements |
- * after a return, unlabeled break or unlabeled continue statement to mark them as dead code. |
+ * [SwitchMember], this loops through the list searching for dead statements. |
+ * |
+ * Dead statements are found after a return, an unlabeled break, an unlabeled |
+ * continue, (A THROW?), or an if statement that unconditionally exits. |
* |
* @param statements some ordered list of statements in a [Block] or [SwitchMember] |
*/ |
void _checkForDeadStatementsInNodeList(NodeList<Statement> statements) { |
+ bool statementExits(Statement statement) { |
Brian Wilkerson
2016/05/04 17:28:19
With the exception of the handling of the break an
srawlins
2016/05/19 18:36:44
Done! Dramatically simpler!
|
+ if (statement is ReturnStatement) { |
+ return true; |
+ } |
+ if ((statement is BreakStatement && statement.label == null) || |
+ (statement is ContinueStatement && statement.label == null)) { |
+ return true; |
+ } |
+ if (statement is IfStatement) { |
+ Statement thenStatement = statement.thenStatement; |
+ Statement elseStatement = statement.elseStatement; |
+ if (elseStatement != null) { |
+ if (ExitDetector.exits(thenStatement) && |
+ ExitDetector.exits(elseStatement)) { |
+ return true; |
+ } |
+ } |
+ } else if (statement is DoStatement) { |
+ if (statement.body != null && ExitDetector.exits(statement.body)) { |
+ return true; |
+ } |
+ } |
+ return false; |
+ } |
+ |
int size = statements.length; |
for (int i = 0; i < size; i++) { |
Statement currentStatement = statements[i]; |
currentStatement?.accept(this); |
- bool returnOrBreakingStatement = currentStatement is ReturnStatement || |
- (currentStatement is BreakStatement && |
- currentStatement.label == null) || |
- (currentStatement is ContinueStatement && |
- currentStatement.label == null); |
- if (returnOrBreakingStatement && i != size - 1) { |
+ if (statementExits(currentStatement) && i != size - 1) { |
Statement nextStatement = statements[i + 1]; |
Statement lastStatement = statements[size - 1]; |
int offset = nextStatement.offset; |