---

yaml
---
r: 229373
b: refs/heads/master-next
c: 9ae572f
h: refs/heads/master
i:
  229371: 3ed4984

Author: lorentey

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: a37c1f05e28110b00b679c219d162d85a7e2b546
-refs/heads/master-next: ff882f4a06439d277ecbca38f15d33eb38dfb321
+refs/heads/master-next: 9ae572f83f9edbb62464bbe1ab62fa176a3bfdea
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/stdlib/public/core/Dictionary.swift

@@ -918,8 +918,13 @@ extension Dictionary {
       return _variant.lookup(key) ?? defaultValue()
     }
     _modify {
-      let index = _variant.lookupOrInsert(key, default: defaultValue)
-      let address = _variant.asNative._values + index.bucket
+      let (index, found) = _variant.mutatingFind(key)
+      let native = _variant.asNative
+      if !found {
+        let value = defaultValue()
+        native._insert(at: index, key: key, value: value)
+      }
+      let address = native._values + index.bucket
       yield &address.pointee
       _fixLifetime(self)
     }
@@ -3544,19 +3549,6 @@ extension Dictionary._Variant {
     }
   }
 
-  @usableFromInline // FIMXE: Should be @inlinable (rdar://problem/44612356)
-  internal mutating func lookupOrInsert(
-    _ key: Key,
-    default defaultValue: () -> Value
-  ) -> _NativeDictionary<Key, Value>.Index {
-    let (index, found) = mutatingFind(key)
-    if !found {
-      let value = defaultValue()
-      asNative._insert(at: index, key: key, value: value)
-    }
-    return index
-  }
-
   /// Ensure uniquely held native storage, while preserving the given index.
   /// (If the variant had bridged storage, then the returned index will be the
   /// corresponding native representation. Otherwise it's kept the same.)