From 4b6eb0e63c698094db5506763df44cc83c19f643 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 20 Mar 2022 12:40:34 +0100 Subject: Merge llvm-project main llvmorg-14-init-10186-gff7f2cfa959b This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-14-init-10186-gff7f2cfa959b. PR: 261742 MFC after: 2 weeks (cherry picked from commit 349cc55c9796c4596a5b9904cd3281af295f878f) --- .../clang/lib/Frontend/TestModuleFileExtension.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'contrib/llvm-project/clang/lib/Frontend/TestModuleFileExtension.cpp') diff --git a/contrib/llvm-project/clang/lib/Frontend/TestModuleFileExtension.cpp b/contrib/llvm-project/clang/lib/Frontend/TestModuleFileExtension.cpp index 7d4026a7efc6..ea737e6891bf 100644 --- a/contrib/llvm-project/clang/lib/Frontend/TestModuleFileExtension.cpp +++ b/contrib/llvm-project/clang/lib/Frontend/TestModuleFileExtension.cpp @@ -93,16 +93,14 @@ TestModuleFileExtension::getExtensionMetadata() const { return { BlockName, MajorVersion, MinorVersion, UserInfo }; } -llvm::hash_code TestModuleFileExtension::hashExtension( - llvm::hash_code Code) const { +void TestModuleFileExtension::hashExtension( + ExtensionHashBuilder &HBuilder) const { if (Hashed) { - Code = llvm::hash_combine(Code, BlockName); - Code = llvm::hash_combine(Code, MajorVersion); - Code = llvm::hash_combine(Code, MinorVersion); - Code = llvm::hash_combine(Code, UserInfo); + HBuilder.add(BlockName); + HBuilder.add(MajorVersion); + HBuilder.add(MinorVersion); + HBuilder.add(UserInfo); } - - return Code; } std::unique_ptr -- cgit v1.2.3