Rollback instrumentation during analysis and validate resolved ASTs instead.

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

Index: pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
diff --git a/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart b/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
index bb90bb4a507ae57c00a67b73fc2db51e8c6ca614..4987624e24c485b77471c59be6a9b6a5434db4c8 100644
--- a/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
@@ -16,7 +16,6 @@ import 'package:analyzer/src/dart/constant/evaluation.dart';
 import 'package:analyzer/src/dart/constant/utilities.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/error/pending_error.dart';
-import 'package:analyzer/src/fasta/uri_instrumentation.dart';
 import 'package:analyzer/src/generated/declaration_resolver.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error_verifier.dart';
@@ -26,7 +25,6 @@ import 'package:analyzer/src/services/lint.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:analyzer/src/task/dart.dart';
 import 'package:analyzer/src/task/strong/checker.dart';
-import 'package:front_end/src/base/instrumentation.dart' as fasta;
 import 'package:front_end/src/dependency_walker.dart';
 
 /**
@@ -39,7 +37,6 @@ class LibraryAnalyzer {
   final FileSystemState _fsState;
   final SummaryDataStore _store;
   final FileState _library;
-  final fasta.Instrumentation _instrumentation;
 
   TypeProvider _typeProvider;
   AnalysisContextImpl _context;
@@ -56,14 +53,8 @@ class LibraryAnalyzer {
   final Map<FileState, List<PendingError>> _fileToPendingErrors = {};
   final List<ConstantEvaluationTarget> _constants = [];
 
-  LibraryAnalyzer(
-      this._analysisOptions,
-      this._declaredVariables,
-      this._sourceFactory,
-      this._fsState,
-      this._store,
-      this._library,
-      this._instrumentation);
+  LibraryAnalyzer(this._analysisOptions, this._declaredVariables,
+      this._sourceFactory, this._fsState, this._store, this._library);
 
   /**
    * Compute analysis results for all units of the library.
@@ -521,10 +512,6 @@ class LibraryAnalyzer {
 
     RecordingErrorListener errorListener = _getErrorListener(file);
 
-    UriInstrumentation instrumentation = _instrumentation != null
-        ? new UriInstrumentation(_instrumentation, file.uri)
-        : null;
-
     CompilationUnitElement unitElement = unit.element;
 
     // TODO(scheglov) Hack: set types for top-level variables
@@ -535,9 +522,6 @@ class LibraryAnalyzer {
     for (var e in unitElement.topLevelVariables) {
       if (!e.isSynthetic) {
         e.type;
-        if (instrumentation != null && e.hasImplicitType) {
-          instrumentation.recordTopType(e.nameOffset, e.type);
-        }
       }
     }
 
@@ -565,8 +549,7 @@ class LibraryAnalyzer {
     // Nothing for RESOLVED_UNIT10?
 
     unit.accept(new ResolverVisitor(
-        _libraryElement, source, _typeProvider, errorListener,
-        instrumentation: instrumentation));
+        _libraryElement, source, _typeProvider, errorListener));
 
     //
     // Find constants to compute.