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

Unified Diff: pkg/analyzer/lib/src/dart/analysis/byte_store.dart

Issue 2524693003: Fix MemoryCachingByteStore._evict after an unsuccessful get. (Closed)
Patch Set: Stop storing null 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 | « no previous file | pkg/analyzer/test/src/dart/analysis/byte_store_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/dart/analysis/byte_store.dart
diff --git a/pkg/analyzer/lib/src/dart/analysis/byte_store.dart b/pkg/analyzer/lib/src/dart/analysis/byte_store.dart
index e8079ee98b1a21c0576f53075a08c81dd0d7ed6c..3f3f5dbf16ea9c3307dced03c29e3912cb392da9 100644
--- a/pkg/analyzer/lib/src/dart/analysis/byte_store.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/byte_store.dart
@@ -63,9 +63,11 @@ class MemoryCachingByteStore implements ByteStore {
List<int> bytes = _map.remove(key);
if (bytes == null) {
bytes = _store.get(key);
- _map[key] = bytes;
- _currentSizeBytes += bytes?.length ?? 0;
- _evict();
+ if (bytes != null) {
+ _map[key] = bytes;
+ _currentSizeBytes += bytes.length;
+ _evict();
+ }
} else {
_map[key] = bytes;
}
@@ -84,6 +86,10 @@ class MemoryCachingByteStore implements ByteStore {
void _evict() {
while (_currentSizeBytes > _maxSizeBytes) {
if (_map.isEmpty) {
+ // Should be impossible, since _currentSizeBytes should always match
+ // _map. But recover anyway.
+ assert(false);
+ _currentSizeBytes = 0;
break;
}
String key = _map.keys.first;
« no previous file with comments | « no previous file | pkg/analyzer/test/src/dart/analysis/byte_store_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698