Remove ExecutableElement.localVariables altogether.

pkg/analyzer/lib/src/summary/resynthesize.dart

 // Copyright (c) 2015, 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 summary_resynthesizer;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_ast_factory.dart';
@@ skipping 808 matching lines @@
   }
 
   @override
   AnalysisContext get context => enclosingElement.context;
 
   @override
   ElementLocation get location => actualElement.location;
 }
 
 /**
- * Local variable element that has been resynthesized from a summary.  The
- * actual element won't be constructed until it is requested.  But properties
- * [context] and [enclosingElement] can be used without creating the actual
- * element.
- */
-class _DeferredLocalVariableElement extends LocalVariableElementHandle {
-  /**
-   * The executable element containing this element.
-   */
-  @override
-  final ExecutableElement enclosingElement;
-
-  /**
-   * The index of this variable within [ExecutableElement.localVariables].
-   */
-  final int _localIndex;
-
-  _DeferredLocalVariableElement(this.enclosingElement, this._localIndex)
-      : super(null, null);
-
-  @override
-  LocalVariableElement get actualElement =>
-      enclosingElement.localVariables[_localIndex];
-
-  @override
-  AnalysisContext get context => enclosingElement.context;
-
-  @override
-  ElementLocation get location => actualElement.location;
-}
-
-/**
  * An instance of [_LibraryResynthesizer] is responsible for resynthesizing the
  * elements in a single library from that library's summary.
  */
 class _LibraryResynthesizer {
   /**
    * The [SummaryResynthesizer] which is being used to obtain summaries.
    */
   final SummaryResynthesizer summaryResynthesizer;
 
   /**
@@ skipping 1012 matching lines @@
           case ReferenceKind.typedef:
             element = new FunctionTypeAliasElementHandle(
                 summaryResynthesizer, location);
             isDeclarableType = true;
             break;
           case ReferenceKind.genericFunctionTypedef:
             element = new GenericTypeAliasElementHandle(
                 summaryResynthesizer, location);
             isDeclarableType = true;
             break;
-          case ReferenceKind.variable:
-            Element enclosingElement = enclosingInfo.element;
-            if (enclosingElement is ExecutableElement) {
-              element = new _DeferredLocalVariableElement(
-                  enclosingElement, linkedReference.localIndex);
-            } else {
-              throw new StateError('Unexpected element enclosing variable:'
-                  ' ${enclosingElement.runtimeType}');
-            }
-            break;
           case ReferenceKind.function:
             Element enclosingElement = enclosingInfo.element;
             if (enclosingElement is VariableElement) {
               element = new _DeferredInitializerElement(enclosingElement);
             } else if (enclosingElement is ExecutableElement) {
               element = new _DeferredLocalFunctionElement(
                   enclosingElement, linkedReference.localIndex);
             } else {
               throw new StateError('Unexpected element enclosing function:'
                   ' ${enclosingElement.runtimeType}');
             }
             break;
           case ReferenceKind.prefix:
             element = new PrefixElementHandle(summaryResynthesizer, location);
             break;
+          case ReferenceKind.variable:
           case ReferenceKind.unresolved:
             break;
         }
       }
       result = new _ReferenceInfo(libraryResynthesizer, enclosingInfo, name,
           isDeclarableType, element, type, numTypeParameters);
       referenceInfos[index] = result;
     }
     return result;
   }
@@ skipping 84 matching lines @@
   static String _getElementIdentifier(String name, ReferenceKind kind) {
     if (kind == ReferenceKind.topLevelPropertyAccessor ||
         kind == ReferenceKind.propertyAccessor) {
       if (!name.endsWith('=')) {
         return name + '?';
       }
     }
     return name;
   }
 }