Update cross-context options encoding to account for patchPlatform.

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

 // Copyright (c) 2016, 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.
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:typed_data';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/error/error.dart';
@@ skipping 48 matching lines @@
  *
  *
  * TODO(scheglov) Clean up the list of implicitly analyzed files.
  *
  * TODO(scheglov) Handle not existing 'dart:x' URIs (while user is typing).
  */
 class AnalysisDriver {
   /**
    * The version of data format, should be incremented on every format change.
    */
-  static const int DATA_VERSION = 2;
+  static const int DATA_VERSION = 3;
 
   /**
    * The name of the driver, e.g. the name of the folder.
    */
   String name;
 
   /**
    * The scheduler that schedules analysis work in this, and possibly other
    * analysis drivers.
    */
@@ skipping 29 matching lines @@
   final SourceFactory _sourceFactory;
 
   /**
    * The analysis options to analyze with.
    */
   final AnalysisOptions _analysisOptions;
 
   /**
    * The salt to mix into all hashes used as keys for serialized data.
    */
-  final Uint32List _salt = new Uint32List(2);
+  final Uint32List _salt =
+      new Uint32List(1 + AnalysisOptions.crossContextOptionsLength);
 
   /**
    * The current file system state.
    */
   FileSystemState _fsState;
 
   /**
    * The combined unlinked and linked package for the SDK, extracted from
    * the given [_sourceFactory].
    */
@@ skipping 460 matching lines @@
 
       return new _LibraryContext(libraryFile, libraryNode, store);
     });
   }
 
   /**
    * Fill [_salt] with data.
    */
   void _fillSalt() {
     _salt[0] = DATA_VERSION;
-    _salt[1] = _analysisOptions.encodeCrossContextOptions();
+    List<int> crossContextOptions =
+        _analysisOptions.encodeCrossContextOptions();
+    assert(crossContextOptions.length ==
+        AnalysisOptions.crossContextOptionsLength);
+    for (int i = 0; i < crossContextOptions.length; i++) {
+      _salt[i + 1] = crossContextOptions[i];
+    }
   }
 
   /**
    * If we know the result [key] for the [file], try to load the analysis
    * result from the cache. Return `null` if not found.
    */
   AnalysisResult _getCachedAnalysisResult(FileState file, String key) {
     List<int> bytes = _byteStore.get(key);
     if (bytes != null) {
       var unit = new AnalysisDriverResolvedUnit.fromBuffer(bytes);
@@ skipping 529 matching lines @@
   /**
    * Complete the [signal] future if it is not completed yet. It is safe to
    * call this method multiple times, but the [signal] will complete only once.
    */
   void notify() {
     if (!_completer.isCompleted) {
       _completer.complete(null);
     }
   }
 }