[stdlib] Set, Dictionary: Hash table unification, general cleanup before ABI stability

stdlib/public/SwiftShims/GlobalObjects.h

@@ -40,43 +40,42 @@ struct _SwiftEmptyArrayStorage {
 SWIFT_RUNTIME_STDLIB_API
 struct _SwiftEmptyArrayStorage _swiftEmptyArrayStorage;
 
-struct _SwiftUnsafeBitMap {
-  __swift_uintptr_t *values;
-  __swift_intptr_t bitCount;
-};
-
 struct _SwiftDictionaryBodyStorage {
-  __swift_intptr_t capacity;
   __swift_intptr_t count;
-  struct _SwiftUnsafeBitMap initializedEntries;
-  void *keys;
-  void *values;
+  __swift_intptr_t capacity;
+  __swift_intptr_t scale;
+  __swift_uint64_t seed0;
+  __swift_uint64_t seed1;
+  void *rawKeys;
+  void *rawValues;
 };
 
 struct _SwiftSetBodyStorage {
-  __swift_intptr_t capacity;
   __swift_intptr_t count;
-  struct _SwiftUnsafeBitMap initializedEntries;
-  void *keys;
+  __swift_intptr_t capacity;
+  __swift_intptr_t scale;
+  __swift_uint64_t seed0;
+  __swift_uint64_t seed1;
+  void *rawElements;
 };
 
-struct _SwiftEmptyDictionaryStorage {
+struct _SwiftEmptyDictionarySingleton {
   struct HeapObject header;
   struct _SwiftDictionaryBodyStorage body;
-  __swift_uintptr_t entries;
+  __swift_uintptr_t metadata;
 };
 
-struct _SwiftEmptySetStorage {
+struct _SwiftEmptySetSingleton {
   struct HeapObject header;
   struct _SwiftSetBodyStorage body;
-  __swift_uintptr_t entries;
+  __swift_uintptr_t metadata;
 };
 
 SWIFT_RUNTIME_STDLIB_API
-struct _SwiftEmptyDictionaryStorage _swiftEmptyDictionaryStorage;
+struct _SwiftEmptyDictionarySingleton _swiftEmptyDictionarySingleton;
 
 SWIFT_RUNTIME_STDLIB_API
-struct _SwiftEmptySetStorage _swiftEmptySetStorage;
+struct _SwiftEmptySetSingleton _swiftEmptySetSingleton;
 
 struct _SwiftHashingParameters {
   __swift_uint64_t seed0;
@@ -91,9 +90,9 @@ struct _SwiftHashingParameters _swift_stdlib_Hashing_parameters;
 
 static_assert(std::is_pod<_SwiftEmptyArrayStorage>::value,
               "empty array type should be POD");
-static_assert(std::is_pod<_SwiftEmptyDictionaryStorage>::value,
+static_assert(std::is_pod<_SwiftEmptyDictionarySingleton>::value,
               "empty dictionary type should be POD");
-static_assert(std::is_pod<_SwiftEmptySetStorage>::value,
+static_assert(std::is_pod<_SwiftEmptySetSingleton>::value,
               "empty set type should be POD");
 
 }} // extern "C", namespace swift

stdlib/public/core/ArrayShared.swift

@@ -61,7 +61,6 @@ func _deallocateUninitializedArray<Element>(
 // Utility method for collections that wish to implement CustomStringConvertible
 // and CustomDebugStringConvertible using a bracketed list of elements,
 // like an array.
-@inlinable // FIXME(sil-serialize-all)
 internal func _makeCollectionDescription<C: Collection>
   (for items: C, withTypeName type: String?) -> String {
   var result = ""