Cleanup registration of closures

pkg/compiler/lib/src/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.
 
 library closureToClassMapper;
 
 import 'common/names.dart' show Identifiers;
 import 'common/resolution.dart' show ParsingContext, Resolution;
 import 'common/tasks.dart' show CompilerTask;
 import 'common.dart';
@@ skipping 1086 matching lines @@
 
   void visitInvokable(
       ExecutableElement element, Node node, void visitChildren()) {
     bool oldInsideClosure = insideClosure;
     Element oldFunctionElement = executableContext;
     ClosureClassMap oldClosureData = closureData;
 
     insideClosure = outermostElement != null;
     LocalFunctionElement closure;
     executableContext = element;
+    bool needsRti = false;
     if (insideClosure) {
       closure = element;
       closures.add(closure);
       closureData = globalizeClosure(node, closure);
+      needsRti = compiler.options.enableTypeAssertions ||
+          compiler.backend.rtiNeed.localFunctionNeedsRti(closure);
     } else {
       outermostElement = element;
       ThisLocal thisElement = null;
       if (element.isInstanceMember || element.isGenerativeConstructor) {
         thisElement = new ThisLocal(element);
       }
       closureData = new ClosureClassMap(null, null, null, thisElement);
+      if (element is MethodElement) {
+        needsRti = compiler.options.enableTypeAssertions ||
+            compiler.backend.rtiNeed.methodNeedsRti(element);
+      }
     }
     closureMappingCache[element.declaration] = closureData;
     if (closureData.callElement != null) {
       closureMappingCache[closureData.callElement] = closureData;
     }
 
     inNewScope(node, () {
-      ResolutionDartType type = element.type;
       // If the method needs RTI, or checked mode is set, we need to
       // escape the potential type variables used in that closure.
-      if (element is FunctionElement &&
-          (compiler.backend.rtiNeed.methodNeedsRti(element) ||
-              compiler.options.enableTypeAssertions)) {
-        analyzeTypeVariables(type);
+      if (needsRti) {
+        analyzeTypeVariables(element.type);
       }
 
       visitChildren();
     });
 
     ClosureClassMap savedClosureData = closureData;
     bool savedInsideClosure = insideClosure;
 
     // Restore old values.
     insideClosure = oldInsideClosure;
@@ skipping 79 matching lines @@
 ///
 /// Move the below classes to a JS model eventually.
 ///
 abstract class JSEntity implements Entity {
   Entity get declaredEntity;
 }
 
 abstract class PrivatelyNamedJSEntity implements JSEntity {
   Entity get rootOfScope;
 }