diff options
| author | Rob Findley <rfindley@google.com> | 2020-09-11 14:23:34 -0400 |
|---|---|---|
| committer | Rob Findley <rfindley@google.com> | 2020-09-11 14:23:34 -0400 |
| commit | f8b1c17aced24a1618c6984794be9770c5d260be (patch) | |
| tree | 45af8d39b5c3d9f43d439ebec0a2ba42b49efe70 /src/sync/map.go | |
| parent | e5d91ab096a9ff9673311f1a7f3f860a7f9c2062 (diff) | |
| parent | 07c1788357cfe6a4ee5f6f6a54d4fe9f579fa844 (diff) | |
| download | go-f8b1c17aced24a1618c6984794be9770c5d260be.tar.gz go-f8b1c17aced24a1618c6984794be9770c5d260be.zip | |
[dev.types] all: merge master into dev.typesdev.types
Change-Id: Ia6964cb4e09153c15cc9c5b441373d1b3cb8f757
Diffstat (limited to 'src/sync/map.go')
| -rw-r--r-- | src/sync/map.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/sync/map.go b/src/sync/map.go index a61e2ebdd6..9ad25353ff 100644 --- a/src/sync/map.go +++ b/src/sync/map.go @@ -274,6 +274,7 @@ func (m *Map) LoadAndDelete(key interface{}) (value interface{}, loaded bool) { e, ok = read.m[key] if !ok && read.amended { e, ok = m.dirty[key] + delete(m.dirty, key) // Regardless of whether the entry was present, record a miss: this key // will take the slow path until the dirty map is promoted to the read // map. |