Skip to content

Commit a6f99a0

Browse files
committed
[rebranch][ClangImporter] Update hashExtension to use HashBuilder
llvm-project updated `hashExtension` in 655bea4226b401a11164f99c6344e38d8742b8e4 to use a `HashBuilder` rather than `hash_code`. Update use in ClangImporter.
1 parent e139a2f commit a6f99a0

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lib/ClangImporter/ImporterImpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1618,7 +1618,7 @@ class SwiftNameLookupExtension : public clang::ModuleFileExtension {
16181618
buffersForDiagnostics(buffersForDiagnostics), availability(avail) {}
16191619

16201620
clang::ModuleFileExtensionMetadata getExtensionMetadata() const override;
1621-
llvm::hash_code hashExtension(llvm::hash_code code) const override;
1621+
void hashExtension(ExtensionHashBuilder &HBuilder) const override;
16221622

16231623
std::unique_ptr<clang::ModuleFileExtensionWriter>
16241624
createExtensionWriter(clang::ASTWriter &writer) override;

lib/ClangImporter/SwiftLookupTable.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,12 +1849,12 @@ SwiftNameLookupExtension::getExtensionMetadata() const {
18491849
return metadata;
18501850
}
18511851

1852-
llvm::hash_code
1853-
SwiftNameLookupExtension::hashExtension(llvm::hash_code code) const {
1854-
return llvm::hash_combine(code, StringRef("swift.lookup"),
1855-
SWIFT_LOOKUP_TABLE_VERSION_MAJOR,
1856-
SWIFT_LOOKUP_TABLE_VERSION_MINOR,
1857-
version::getSwiftFullVersion());
1852+
void
1853+
SwiftNameLookupExtension::hashExtension(ExtensionHashBuilder &HBuilder) const {
1854+
HBuilder.add(StringRef("swift.lookup"));
1855+
HBuilder.add(SWIFT_LOOKUP_TABLE_VERSION_MAJOR);
1856+
HBuilder.add(SWIFT_LOOKUP_TABLE_VERSION_MINOR);
1857+
HBuilder.add(version::getSwiftFullVersion());
18581858
}
18591859

18601860
void importer::addEntryToLookupTable(SwiftLookupTable &table,

0 commit comments

Comments
 (0)