Address review comments from https://chromiumcodereview.appspot.com/10454049/.

lib/compiler/implementation/ssa/closure.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 class ClosureFieldElement extends Element {
   ClosureFieldElement(SourceString name, ClassElement enclosing)
       : super(name, ElementKind.FIELD, enclosing);
 
   bool isInstanceMember() => true;
   bool isAssignable() => false;
@@ skipping 82 matching lines @@
         this.capturingScopes = new Map<Node, ClosureScope>(),
         this.usedVariablesInTry = new Set<Element>();
 
   bool isClosure() => closureElement !== null;
 }
 
 class ClosureTranslator extends AbstractVisitor {
   final SsaBuilder builder;
   final TreeElements elements;
   int closureFieldCounter = 0;
-  bool inTryCatchOrFinally = false;
+  bool inTryStatement = false;
   final Map<Node, ClosureData> closureDataCache;
 
   // Map of captured variables. Initially they will map to themselves. If
   // a variable needs to be boxed then the scope declaring the variable
   // will update this mapping.
   Map<Element, Element> capturedVariableMapping;
   // List of encountered closures.
   List<FunctionExpression> closures;
 
   // The variables that have been declared in the current scope.
@@ skipping 87 matching lines @@
       ConstructorBodyElement body = functionElement;
       functionElement = body.constructor;
     }
     // If the element is not declared in the current function and the element
     // is not the closure itself we need to mark the element as free variable.
     if (element.enclosingElement != functionElement &&
         element != functionElement) {
       assert(closureData.freeVariableMapping[element] == null ||
              closureData.freeVariableMapping[element] == element);
       closureData.freeVariableMapping[element] = element;
-    } else if (inTryCatchOrFinally) {
+    } else if (inTryStatement) {
       // Don't mark the this-element. This would complicate things in the
       // builder.
       if (element != closureData.thisElement) {
         // TODO(ngeoffray): only do this if the variable is mutated.
         closureData.usedVariablesInTry.add(element);
       }
     }
   }
 
   void declareLocal(Element element) {
@@ skipping 207 matching lines @@
     }
   }
 
   visitFunctionDeclaration(FunctionDeclaration node) {
     node.visitChildren(this);
     declareLocal(elements[node]);
   }
 
   visitTryStatement(TryStatement node) {
     // TODO(ngeoffray): implement finer grain state.
-    bool oldInTryCatchOrFinally = inTryCatchOrFinally;
-    inTryCatchOrFinally = true;
+    bool oldInTryStatement = inTryStatement;
+    inTryStatement = true;
     node.visitChildren(this);
-    inTryCatchOrFinally = oldInTryCatchOrFinally;
+    inTryStatement = oldInTryStatement;
   }
 }