Update cross-context options encoding to account for patchPlatform.

pkg/analyzer/lib/src/generated/sdk.dart

 // Copyright (c) 2014, 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.generated.sdk;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
@@ skipping 194 matching lines @@
 
   /**
    * Initialize a newly created SDK description to describe an SDK based on the
    * files or directories at the given [paths] that is analyzed using the given
    * [options].
    */
   SdkDescription(this.paths, this.options);
 
   @override
   int get hashCode {
-    int hashCode = options.encodeCrossContextOptions();
+    int hashCode = 0;
+    for (int value in options.encodeCrossContextOptions()) {
+      hashCode = JenkinsSmiHash.combine(hashCode, value);
+    }
     for (String path in paths) {
       hashCode = JenkinsSmiHash.combine(hashCode, path.hashCode);
     }
     return JenkinsSmiHash.finish(hashCode);
   }
 
   @override
   bool operator ==(Object other) {
     if (other is SdkDescription) {
-      if (options.encodeCrossContextOptions() !=
-          other.options.encodeCrossContextOptions()) {
+      if (!AnalysisOptions.crossContextOptionsEqual(
+          options.encodeCrossContextOptions(),
+          other.options.encodeCrossContextOptions())) {
         return false;
       }
       int length = paths.length;
       if (other.paths.length != length) {
         return false;
       }
       for (int i = 0; i < length; i++) {
         if (other.paths[i] != paths[i]) {
           return false;
         }
@@ skipping 422 matching lines @@
     _platformsToPatchPaths[platforms] = paths;
   }
 
   /**
    * Record that this library can be run on the VM.
    */
   void setVmLibrary() {
     _platforms |= VM_PLATFORM;
   }
 }