Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1000)

Unified Diff: pkg/analyzer/lib/src/generated/package.dart

Issue 2486973004: Update cross-context options encoding to account for patchPlatform. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/analyzer/lib/src/generated/engine.dart ('k') | pkg/analyzer/lib/src/generated/sdk.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/generated/package.dart
diff --git a/pkg/analyzer/lib/src/generated/package.dart b/pkg/analyzer/lib/src/generated/package.dart
index b715e3bd13efcd32cbcaa37476f1f1ce224bd3a6..dddce5a037b4d96b0089fb15ec24b04de6a29720 100644
--- a/pkg/analyzer/lib/src/generated/package.dart
+++ b/pkg/analyzer/lib/src/generated/package.dart
@@ -157,7 +157,10 @@ class PackageDescription {
@override
int get hashCode {
- int hashCode = options.encodeCrossContextOptions();
+ int hashCode = 0;
+ for (int value in options.encodeCrossContextOptions()) {
+ hashCode = JenkinsSmiHash.combine(hashCode, value);
+ }
hashCode = JenkinsSmiHash.combine(hashCode, id.hashCode);
hashCode = JenkinsSmiHash.combine(hashCode, sdk.hashCode);
return JenkinsSmiHash.finish(hashCode);
@@ -167,8 +170,9 @@ class PackageDescription {
bool operator ==(Object other) {
return other is PackageDescription &&
other.sdk == sdk &&
- other.options.encodeCrossContextOptions() ==
- options.encodeCrossContextOptions() &&
+ AnalysisOptions.crossContextOptionsEqual(
+ other.options.encodeCrossContextOptions(),
+ options.encodeCrossContextOptions()) &&
other.id == id;
}
}
« no previous file with comments | « pkg/analyzer/lib/src/generated/engine.dart ('k') | pkg/analyzer/lib/src/generated/sdk.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698