From ab50317e96e57dee5b3ff4ad3f16f205b2a3359e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 24 Jan 2024 20:17:23 +0100 Subject: Merge llvm-project main llvmorg-18-init-18359-g93248729cfae This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-18-init-18359-g93248729cfae, the last commit before the upstream release/18.x branch was created. PR: 276104 MFC after: 1 month (cherry picked from commit 7a6dacaca14b62ca4b74406814becb87a3fefac0) --- contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp') diff --git a/contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp b/contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp index 42d55d09ea5a..afb2948f05ae 100644 --- a/contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp +++ b/contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp @@ -308,7 +308,7 @@ void ModuleMap::resolveHeader(Module *Mod, setUmbrellaHeaderAsWritten(Mod, *File, Header.FileName, RelativePathName.str()); } else { - Module::Header H = {Header.FileName, std::string(RelativePathName.str()), + Module::Header H = {Header.FileName, std::string(RelativePathName), *File}; addHeader(Mod, H, headerKindToRole(Header.Kind)); } -- cgit v1.2.3