Skip to content

Commit 2332508

Browse files
committed
---
yaml --- r: 243172 b: refs/heads/swift-5.0-branch c: 098275f h: refs/heads/master
1 parent 2b9f0a1 commit 2332508

File tree

7 files changed

+2224
-2832
lines changed

7 files changed

+2224
-2832
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2017-12-23-a: b7c074342459a645779f106c42bf4
643643
refs/heads/master-llvm-swift5-transition: 8ace18c8953afb3d7d94cf04cacc0b51a7e5f1e3
644644
"refs/heads/revert-12883-disable_modelio_test_ios": a77ae373b809a0d8cb460cf3d1585d618510d242
645645
refs/heads/revert-13597-master: cccee1df039d072215f9bddc2cbc1e32a8d5d5ee
646-
refs/heads/swift-5.0-branch: 86f64f552c6b46575051d19a43366d01166012a0
646+
refs/heads/swift-5.0-branch: 098275f3c7ad8b410e7bff2e8a959e6a9857bf3f
647647
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-23-a: b32214f7e04339dfada623b6b76dbebfb41e4541
648648
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-24-a: 1eb0be506c0744c7eff0550a10240286046e181d
649649
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-25-a: f35a91502bad0065c83d8760407c23be7b899f48

branches/swift-5.0-branch/stdlib/public/SwiftShims/GlobalObjects.h

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,36 +40,33 @@ struct _SwiftEmptyArrayStorage {
4040
SWIFT_RUNTIME_STDLIB_API
4141
struct _SwiftEmptyArrayStorage _swiftEmptyArrayStorage;
4242

43-
struct _SwiftUnsafeBitMap {
44-
__swift_uintptr_t *values;
45-
__swift_intptr_t bitCount;
46-
};
47-
4843
struct _SwiftDictionaryBodyStorage {
49-
__swift_intptr_t capacity;
5044
__swift_intptr_t count;
51-
struct _SwiftUnsafeBitMap initializedEntries;
52-
void *keys;
53-
void *values;
45+
__swift_intptr_t capacity;
46+
__swift_intptr_t scale;
47+
__swift_uint64_t seed;
48+
void *rawKeys;
49+
void *rawValues;
5450
};
5551

5652
struct _SwiftSetBodyStorage {
57-
__swift_intptr_t capacity;
5853
__swift_intptr_t count;
59-
struct _SwiftUnsafeBitMap initializedEntries;
60-
void *keys;
54+
__swift_intptr_t capacity;
55+
__swift_intptr_t scale;
56+
__swift_uint64_t seed;
57+
void *rawElements;
6158
};
6259

6360
struct _SwiftEmptyDictionarySingleton {
6461
struct HeapObject header;
6562
struct _SwiftDictionaryBodyStorage body;
66-
__swift_uintptr_t entries;
63+
__swift_uint64_t metadata;
6764
};
6865

6966
struct _SwiftEmptySetSingleton {
7067
struct HeapObject header;
7168
struct _SwiftSetBodyStorage body;
72-
__swift_uintptr_t entries;
69+
__swift_uint64_t metadata;
7370
};
7471

7572
SWIFT_RUNTIME_STDLIB_API

0 commit comments

Comments
 (0)