Merge pull request #22527 from Catfish-Man/literally-empty

Author: swift-ci

stdlib/public/core/NativeDictionary.swift

@@ -37,7 +37,11 @@ internal struct _NativeDictionary<Key: Hashable, Value> {
 
   @inlinable
   internal init(capacity: Int) {
-    self._storage = _DictionaryStorage<Key, Value>.allocate(capacity: capacity)
+    if capacity == 0 {
+      self._storage = __RawDictionaryStorage.empty
+    } else {
+      self._storage = _DictionaryStorage<Key, Value>.allocate(capacity: capacity)
+    }
   }
 
 #if _runtime(_ObjC)
@@ -48,13 +52,17 @@ internal struct _NativeDictionary<Key: Hashable, Value> {
 
   @inlinable
   internal init(_ cocoa: __owned __CocoaDictionary, capacity: Int) {
-    _internalInvariant(cocoa.count <= capacity)
-    self._storage =
-      _DictionaryStorage<Key, Value>.convert(cocoa, capacity: capacity)
-    for (key, value) in cocoa {
-      insertNew(
-        key: _forceBridgeFromObjectiveC(key, Key.self),
-        value: _forceBridgeFromObjectiveC(value, Value.self))
+    if capacity == 0 {
+      self._storage = __RawDictionaryStorage.empty
+    } else {
+      _internalInvariant(cocoa.count <= capacity)
+      self._storage =
+        _DictionaryStorage<Key, Value>.convert(cocoa, capacity: capacity)
+      for (key, value) in cocoa {
+        insertNew(
+          key: _forceBridgeFromObjectiveC(key, Key.self),
+          value: _forceBridgeFromObjectiveC(value, Value.self))
+      }
     }
   }
 #endif

stdlib/public/core/NativeSet.swift

@@ -36,7 +36,11 @@ internal struct _NativeSet<Element: Hashable> {
 
   @inlinable
   internal init(capacity: Int) {
-    self._storage = _SetStorage<Element>.allocate(capacity: capacity)
+    if capacity == 0 {
+      self._storage = __RawSetStorage.empty
+    } else {
+      self._storage = _SetStorage<Element>.allocate(capacity: capacity)
+    }
   }
 
 #if _runtime(_ObjC)
@@ -47,11 +51,15 @@ internal struct _NativeSet<Element: Hashable> {
 
   @inlinable
   internal init(_ cocoa: __owned __CocoaSet, capacity: Int) {
-    _internalInvariant(cocoa.count <= capacity)
-    self._storage = _SetStorage<Element>.convert(cocoa, capacity: capacity)
-    for element in cocoa {
-      let nativeElement = _forceBridgeFromObjectiveC(element, Element.self)
-      insertNew(nativeElement, isUnique: true)
+    if capacity == 0 {
+      self._storage = __RawSetStorage.empty
+    } else {
+      _internalInvariant(cocoa.count <= capacity)
+      self._storage = _SetStorage<Element>.convert(cocoa, capacity: capacity)
+      for element in cocoa {
+        let nativeElement = _forceBridgeFromObjectiveC(element, Element.self)
+        insertNew(nativeElement, isUnique: true)
+      }
     }
   }
 #endif

validation-test/stdlib/Dictionary.swift

@@ -3010,7 +3010,7 @@ DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.RemoveAll") {
     assert(d.count == 0)
 
     let empty = Dictionary<Int, Int>()
-    expectNotEqual(empty._rawIdentifier(), d._rawIdentifier())
+    expectEqual(empty._rawIdentifier(), d._rawIdentifier())
 
     d.removeAll()
     assert(empty._rawIdentifier() == d._rawIdentifier())
@@ -3305,19 +3305,19 @@ DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.EqualityTest_Empty") {
   var d2 = getBridgedNonverbatimEquatableDictionary([:])
   let identity2 = d2._rawIdentifier()
   assert(isNativeDictionary(d2))
-  assert(identity1 != identity2)
+  assert(identity1 == identity2)
 
   assert(d1 == d2)
   assert(identity1 == d1._rawIdentifier())
   assert(identity2 == d2._rawIdentifier())
 
   d2[TestBridgedKeyTy(10)] = TestBridgedEquatableValueTy(2010)
   assert(isNativeDictionary(d2))
-  assert(identity2 == d2._rawIdentifier())
+  assert(identity2 != d2._rawIdentifier())
 
   assert(d1 != d2)
   assert(identity1 == d1._rawIdentifier())
-  assert(identity2 == d2._rawIdentifier())
+  assert(identity2 != d2._rawIdentifier())
 }
 
 

validation-test/stdlib/Set.swift

@@ -1986,7 +1986,7 @@ SetTestSuite.test("BridgedFromObjC.Nonverbatim.RemoveAll") {
     expectEqual(0, s.count)
 
     let emptySet = Set<Int>()
-    expectNotEqual(emptySet._rawIdentifier(), s._rawIdentifier())
+    expectEqual(emptySet._rawIdentifier(), s._rawIdentifier())
 
     s.removeAll()
     expectEqual(emptySet._rawIdentifier(), s._rawIdentifier())
@@ -2178,19 +2178,19 @@ SetTestSuite.test("BridgedFromObjC.Nonverbatim.EqualityTest_Empty") {
   var s2 = getBridgedNonverbatimSet([])
   let identity2 = s2._rawIdentifier()
   expectTrue(isNativeSet(s2))
-  expectNotEqual(identity1, identity2)
+  expectEqual(identity1, identity2)
 
   expectEqual(s1, s2)
   expectEqual(identity1, s1._rawIdentifier())
   expectEqual(identity2, s2._rawIdentifier())
 
   s2.insert(TestObjCKeyTy(4040) as TestBridgedKeyTy)
   expectTrue(isNativeSet(s2))
-  expectEqual(identity2, s2._rawIdentifier())
+  expectNotEqual(identity2, s2._rawIdentifier())
 
   expectNotEqual(s1, s2)
   expectEqual(identity1, s1._rawIdentifier())
-  expectEqual(identity2, s2._rawIdentifier())
+  expectNotEqual(identity2, s2._rawIdentifier())
 }
 
 SetTestSuite.test("BridgedFromObjC.Verbatim.EqualityTest_Small") {