Merge pull request #78919 from kubamracek/embedded-dict-init

[embedded] Support Dictionary.init(uniqueKeysWithValues:) in Embedded Swift

Author: kubamracek

stdlib/public/core/Dictionary.swift

@@ -486,10 +486,20 @@ public struct Dictionary<Key: Hashable, Value> {
     // error instead of calling fatalError() directly because we want the
     // message to include the duplicate key, and the closure only has access to
     // the conflicting values.
+    #if !$Embedded
     try! native.merge(
       keysAndValues,
       isUnique: true,
       uniquingKeysWith: { _, _ in throw _MergeError.keyCollision })
+    #else
+    native.merge(
+      keysAndValues,
+      isUnique: true,
+      uniquingKeysWith: { _, _ throws(_MergeError) in
+        throw _MergeError.keyCollision
+      }
+    )
+    #endif
     self.init(_native: native)
   }
 

stdlib/public/core/NativeDictionary.swift

@@ -791,6 +791,35 @@ extension _NativeDictionary { // High-level operations
     }
   }
 
+  #if $Embedded
+  @inlinable
+  internal mutating func merge<S: Sequence>(
+    _ keysAndValues: __owned S,
+    isUnique: Bool,
+    uniquingKeysWith combine: (Value, Value) throws(_MergeError) -> Value
+  ) where S.Element == (Key, Value) {
+    var isUnique = isUnique
+    for (key, value) in keysAndValues {
+      let (bucket, found) = mutatingFind(key, isUnique: isUnique)
+      isUnique = true
+      if found {
+        do throws(_MergeError) {
+          let newValue = try combine(uncheckedValue(at: bucket), value)
+          _values[bucket.offset] = newValue
+        } catch {
+          #if !$Embedded
+          fatalError("Duplicate values for key: '\(key)'")
+          #else
+          fatalError("Duplicate values for a key in a Dictionary")
+          #endif
+        }
+      } else {
+        _insert(at: bucket, key: key, value: value)
+      }
+    }
+  }
+  #endif
+
   @inlinable
   @inline(__always)
   internal init<S: Sequence>(

test/embedded/dict-init.swift

@@ -0,0 +1,17 @@
+// RUN: %target-run-simple-swift(-enable-experimental-feature Embedded -wmo) | %FileCheck %s
+
+// REQUIRES: swift_in_compiler
+// REQUIRES: executable_test
+// REQUIRES: OS=macosx
+// REQUIRES: swift_feature_Embedded
+
+public func foo() {
+    let d = Dictionary<Int, StaticString>.init(uniqueKeysWithValues: [(10, "hello"), (20, "world")])
+    print(d[10]!)
+    print(d[20]!)
+}
+
+foo()
+
+// CHECK: hello
+// CHECK: world