diff options
Diffstat (limited to 'clang')
-rw-r--r-- | clang/include/clang/Basic/ObjCRuntime.h | 2 | ||||
-rw-r--r-- | clang/include/clang/Basic/Sanitizers.h | 2 | ||||
-rw-r--r-- | clang/include/clang/Lex/HeaderSearchOptions.h | 4 | ||||
-rw-r--r-- | clang/lib/Frontend/CompilerInvocation.cpp | 2 | ||||
-rw-r--r-- | clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp | 3 |
5 files changed, 6 insertions, 7 deletions
diff --git a/clang/include/clang/Basic/ObjCRuntime.h b/clang/include/clang/Basic/ObjCRuntime.h index d783154..500b246 100644 --- a/clang/include/clang/Basic/ObjCRuntime.h +++ b/clang/include/clang/Basic/ObjCRuntime.h @@ -482,7 +482,7 @@ public: return llvm::hash_combine(OCR.getKind(), OCR.getVersion()); } - template <typename HasherT, llvm::support::endianness Endianness> + template <typename HasherT, llvm::endianness Endianness> friend void addHash(llvm::HashBuilder<HasherT, Endianness> &HBuilder, const ObjCRuntime &OCR) { HBuilder.add(OCR.getKind(), OCR.getVersion()); diff --git a/clang/include/clang/Basic/Sanitizers.h b/clang/include/clang/Basic/Sanitizers.h index 090a3a7..8fdaf2e 100644 --- a/clang/include/clang/Basic/Sanitizers.h +++ b/clang/include/clang/Basic/Sanitizers.h @@ -77,7 +77,7 @@ public: llvm::hash_code hash_value() const; - template <typename HasherT, llvm::support::endianness Endianness> + template <typename HasherT, llvm::endianness Endianness> friend void addHash(llvm::HashBuilder<HasherT, Endianness> &HBuilder, const SanitizerMask &SM) { HBuilder.addRange(&SM.maskLoToHigh[0], &SM.maskLoToHigh[kNumElem]); diff --git a/clang/include/clang/Lex/HeaderSearchOptions.h b/clang/include/clang/Lex/HeaderSearchOptions.h index 206bc69..c7d9500 100644 --- a/clang/include/clang/Lex/HeaderSearchOptions.h +++ b/clang/include/clang/Lex/HeaderSearchOptions.h @@ -267,7 +267,7 @@ inline llvm::hash_code hash_value(const HeaderSearchOptions::Entry &E) { return llvm::hash_combine(E.Path, E.Group, E.IsFramework, E.IgnoreSysRoot); } -template <typename HasherT, llvm::support::endianness Endianness> +template <typename HasherT, llvm::endianness Endianness> inline void addHash(llvm::HashBuilder<HasherT, Endianness> &HBuilder, const HeaderSearchOptions::Entry &E) { HBuilder.add(E.Path, E.Group, E.IsFramework, E.IgnoreSysRoot); @@ -278,7 +278,7 @@ hash_value(const HeaderSearchOptions::SystemHeaderPrefix &SHP) { return llvm::hash_combine(SHP.Prefix, SHP.IsSystemHeader); } -template <typename HasherT, llvm::support::endianness Endianness> +template <typename HasherT, llvm::endianness Endianness> inline void addHash(llvm::HashBuilder<HasherT, Endianness> &HBuilder, const HeaderSearchOptions::SystemHeaderPrefix &SHP) { HBuilder.add(SHP.Prefix, SHP.IsSystemHeader); diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index f2fe904..bb44249 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -4630,7 +4630,7 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Invocation, std::string CompilerInvocation::getModuleHash() const { // FIXME: Consider using SHA1 instead of MD5. - llvm::HashBuilder<llvm::MD5, llvm::support::endianness::native> HBuilder; + llvm::HashBuilder<llvm::MD5, llvm::endianness::native> HBuilder; // Note: For QoI reasons, the things we use as a hash here should all be // dumped via the -module-info flag. diff --git a/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp b/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp index 5e028c4..40115b7b 100644 --- a/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp +++ b/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp @@ -295,8 +295,7 @@ void ModuleDepCollector::applyDiscoveredDependencies(CompilerInvocation &CI) { static std::string getModuleContextHash(const ModuleDeps &MD, const CowCompilerInvocation &CI, bool EagerLoadModules) { - llvm::HashBuilder<llvm::TruncatedBLAKE3<16>, - llvm::support::endianness::native> + llvm::HashBuilder<llvm::TruncatedBLAKE3<16>, llvm::endianness::native> HashBuilder; SmallString<32> Scratch; |