averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into manual-main-20240814

Browse Source 
Conflicts:
  - `include/swift/Localization/LocalizationFormat.h`
  - `lib/ClangImporter/SwiftLookupTable.cpp`
  - `lib/ClangImporter/SwiftLookupTable.h`
  - `lib/Serialization/ModuleFormat.h`
  - `lib/Serialization/Serialization.cpp`

All from the hash changes being added to main. Took main except for the
lookup table minor version, which needs to be bumped still because of
other changes.
This commit is contained in:
Ben Barham
2024-08-14 19:21:52 -07:00
parent 37c12030dc 4fc85d7816
commit 05d62155f8
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/Serialization.cpp
View File

@@ -414,7 +414,7 @@ namespace {
using offset_type = unsigned;
hash_value_type ComputeHash(key_type_ref key) {
return static_cast<uint32_t>(key);
return key;
}
std::pair<unsigned, unsigned> EmitKeyDataLength(raw_ostream &out,
@@ -459,7 +459,7 @@ namespace {
using offset_type = unsigned;
hash_value_type ComputeHash(key_type_ref key) {
return static_cast<uint32_t>(key);
return key;
}
std::pair<unsigned, unsigned>