When validating cache consistency, skip sources in content cache.

pkg/analyzer/lib/src/context/context.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 analyzer.src.context.context;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 2040 matching lines @@
   }
 }
 
 class CacheConsistencyValidatorImpl implements CacheConsistencyValidator {
   final AnalysisContextImpl context;
 
   CacheConsistencyValidatorImpl(this.context);
 
   @override
   List<Source> getSourcesToComputeModificationTimes() {
-    List<Source> sources = <Source>[];
-    for (Source source in context._privatePartition.sources) {
-      if (context._contentCache.getModificationStamp(source) == null) {
-        sources.add(source);
-      }
-    }
-    return sources;
+    return context._privatePartition.sources.toList();
   }
 
   @override
   bool sourceModificationTimesComputed(List<Source> sources, List<int> times) {
     int consistencyCheckStart = JavaSystem.nanoTime();
     HashSet<Source> changedSources = new HashSet<Source>();
     HashSet<Source> missingSources = new HashSet<Source>();
     for (int i = 0; i < sources.length; i++) {
       Source source = sources[i];
+      // When a source is in the content cache,
+      // its modification time in the file system does not matter.
+      if (context._contentCache.getModificationStamp(source) != null) {
+        continue;
+      }
+      // When we were not able to compute the modification time in the
+      // file system, there is nothing to compare with, so skip the source.
       int sourceTime = times[i];
-      if (sourceTime != null) {
-        CacheEntry entry = context._privatePartition.get(source);
-        if (entry != null) {
-          if (sourceTime != entry.modificationTime) {
-            changedSources.add(source);
+      if (sourceTime == null) {
+        continue;
+      }
+      // Compare with the modification time in the cache entry.
+      CacheEntry entry = context._privatePartition.get(source);
+      if (entry != null) {
+        if (sourceTime != entry.modificationTime) {
+          changedSources.add(source);
+          PerformanceStatistics
+              .cacheConsistencyValidationStatistics.numOfModified++;
+        }
+        if (entry.exception != null) {
+          if (sourceTime == -1) {
+            missingSources.add(source);
             PerformanceStatistics
                 .cacheConsistencyValidationStatistics.numOfModified++;
           }
-          if (entry.exception != null) {
-            if (sourceTime == -1) {
-              missingSources.add(source);
-              PerformanceStatistics
-                  .cacheConsistencyValidationStatistics.numOfModified++;
-            }
-          }
         }
       }
     }
     for (Source source in changedSources) {
       context._sourceChanged(source);
     }
     int removalCount = 0;
     for (Source source in missingSources) {
       if (context.getLibrariesContaining(source).isEmpty &&
           context.getLibrariesDependingOn(source).isEmpty) {
@@ skipping 190 matching lines @@
     }
     DartSdk sdk = factory.dartSdk;
     if (sdk == null) {
       throw new IllegalArgumentException(
           "The source factory for an SDK analysis context must have a DartUriResolver");
     }
     return new AnalysisCache(
         <CachePartition>[AnalysisEngine.instance.partitionManager.forSdk(sdk)]);
   }
 }