mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
Merge branch 'master' into rename-conflicting-classes-and-methods
This commit is contained in:
@@ -28,13 +28,13 @@ namespace swift {
|
||||
SWIFT_RUNTIME_STDLIB_API
|
||||
ClassMetadata CLASS_METADATA_SYM(s19__EmptyArrayStorage);
|
||||
|
||||
// _direct type metadata for Swift.__RawNativeDictionaryStorage
|
||||
// _direct type metadata for Swift._EmptyDictionarySingleton
|
||||
SWIFT_RUNTIME_STDLIB_API
|
||||
ClassMetadata CLASS_METADATA_SYM(s28__RawNativeDictionaryStorage);
|
||||
ClassMetadata CLASS_METADATA_SYM(s25_EmptyDictionarySingleton);
|
||||
|
||||
// _direct type metadata for Swift.__RawNativeSetStorage
|
||||
// _direct type metadata for Swift._EmptySetSingleton
|
||||
SWIFT_RUNTIME_STDLIB_API
|
||||
ClassMetadata CLASS_METADATA_SYM(s21__RawNativeSetStorage);
|
||||
ClassMetadata CLASS_METADATA_SYM(s18_EmptySetSingleton);
|
||||
} // namespace swift
|
||||
|
||||
SWIFT_RUNTIME_STDLIB_API
|
||||
@@ -52,58 +52,52 @@ swift::_SwiftEmptyArrayStorage swift::_swiftEmptyArrayStorage = {
|
||||
};
|
||||
|
||||
SWIFT_RUNTIME_STDLIB_API
|
||||
swift::_SwiftEmptyDictionaryStorage swift::_swiftEmptyDictionaryStorage = {
|
||||
swift::_SwiftEmptyDictionarySingleton swift::_swiftEmptyDictionarySingleton = {
|
||||
// HeapObject header;
|
||||
{
|
||||
&swift::CLASS_METADATA_SYM(s28__RawNativeDictionaryStorage), // isa pointer
|
||||
&swift::CLASS_METADATA_SYM(s25_EmptyDictionarySingleton), // isa pointer
|
||||
},
|
||||
|
||||
// _SwiftDictionaryBodyStorage body;
|
||||
{
|
||||
// We set the capacity to 1 so that there's an empty hole to search.
|
||||
// Any insertion will lead to a real storage being allocated, because
|
||||
// Dictionary guarantees there's always another empty hole after insertion.
|
||||
1, // int capacity;
|
||||
// Setting the scale to 0 makes for a bucketCount of 1 -- so that the
|
||||
// storage consists of a single unoccupied bucket. The capacity is set to
|
||||
// 0 so that any insertion will lead to real storage being allocated.
|
||||
0, // int count;
|
||||
|
||||
// _SwiftUnsafeBitMap initializedEntries
|
||||
{
|
||||
&swift::_swiftEmptyDictionaryStorage.entries, // unsigned int* values;
|
||||
1 // int bitCount; (1 so there's something for iterators to read)
|
||||
},
|
||||
|
||||
(void*)1, // void* keys; (non-null garbage)
|
||||
(void*)1 // void* values; (non-null garbage)
|
||||
0, // int capacity;
|
||||
0, // int scale;
|
||||
0, // uint64 seed0;
|
||||
0, // uint64 seed1;
|
||||
(void *)1, // void* keys; (non-null garbage)
|
||||
(void *)1 // void* values; (non-null garbage)
|
||||
},
|
||||
|
||||
0 // int entries; (zero'd bits)
|
||||
// bucket 0 is unoccupied; other buckets are out-of-bounds
|
||||
static_cast<__swift_uintptr_t>(~1) // int metadata;
|
||||
};
|
||||
|
||||
SWIFT_RUNTIME_STDLIB_API
|
||||
swift::_SwiftEmptySetStorage swift::_swiftEmptySetStorage = {
|
||||
swift::_SwiftEmptySetSingleton swift::_swiftEmptySetSingleton = {
|
||||
// HeapObject header;
|
||||
{
|
||||
&swift::CLASS_METADATA_SYM(s21__RawNativeSetStorage), // isa pointer
|
||||
&swift::CLASS_METADATA_SYM(s18_EmptySetSingleton), // isa pointer
|
||||
},
|
||||
|
||||
// _SwiftDictionaryBodyStorage body;
|
||||
// _SwiftSetBodyStorage body;
|
||||
{
|
||||
// We set the capacity to 1 so that there's an empty hole to search.
|
||||
// Any insertion will lead to a real storage being allocated, because
|
||||
// Dictionary guarantees there's always another empty hole after insertion.
|
||||
1, // int capacity;
|
||||
// Setting the scale to 0 makes for a bucketCount of 1 -- so that the
|
||||
// storage consists of a single unoccupied bucket. The capacity is set to
|
||||
// 0 so that any insertion will lead to real storage being allocated.
|
||||
0, // int count;
|
||||
|
||||
// _SwiftUnsafeBitMap initializedEntries
|
||||
{
|
||||
&swift::_swiftEmptySetStorage.entries, // unsigned int* values;
|
||||
1 // int bitCount; (1 so there's something for iterators to read)
|
||||
},
|
||||
|
||||
(void*)1 // void* keys; (non-null garbage)
|
||||
0, // int capacity;
|
||||
0, // int scale;
|
||||
0, // uint64 seed0;
|
||||
0, // uint64 seed1;
|
||||
(void *)1, // void *rawElements; (non-null garbage)
|
||||
},
|
||||
|
||||
0 // int entries; (zero'd bits)
|
||||
// bucket 0 is unoccupied; other buckets are out-of-bounds
|
||||
static_cast<__swift_uintptr_t>(~1) // int metadata;
|
||||
};
|
||||
|
||||
static swift::_SwiftHashingParameters initializeHashingParameters() {
|
||||
|
||||
Reference in New Issue
Block a user