This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG395e1fe30574: [clang] Capture Framework when HeaderSearch is
resolved via headermap (authored by cishida).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D111468/new/
https://reviews.llvm.org/D111468
Files:
clang/lib/Lex/HeaderSearch.cpp
clang/unittests/Lex/HeaderSearchTest.cpp
Index: clang/unittests/Lex/HeaderSearchTest.cpp
===================================================================
--- clang/unittests/Lex/HeaderSearchTest.cpp
+++ clang/unittests/Lex/HeaderSearchTest.cpp
@@ -18,6 +18,7 @@
#include "clang/Lex/HeaderSearch.h"
#include "clang/Lex/HeaderSearchOptions.h"
#include "clang/Serialization/InMemoryModuleCache.h"
+#include "llvm/Support/MemoryBuffer.h"
#include "gtest/gtest.h"
namespace clang {
@@ -47,7 +48,8 @@
}
void addHeaderMap(llvm::StringRef Filename,
- std::unique_ptr<llvm::MemoryBuffer> Buf) {
+ std::unique_ptr<llvm::MemoryBuffer> Buf,
+ bool isAngled = false) {
VFS->addFile(Filename, 0, std::move(Buf), /*User=*/None, /*Group=*/None,
llvm::sys::fs::file_type::regular_file);
auto FE = FileMgr.getFile(Filename, true);
@@ -58,7 +60,7 @@
HMap = HeaderMap::Create(*FE, FileMgr);
auto DL =
DirectoryLookup(HMap.get(), SrcMgr::C_User, /*isFramework=*/false);
- Search.AddSearchPath(DL, /*isAngled=*/false);
+ Search.AddSearchPath(DL, isAngled);
}
IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> VFS;
@@ -179,5 +181,48 @@
"d.h");
}
+TEST_F(HeaderSearchTest, HeaderMapFrameworkLookup) {
+ typedef NullTerminatedFile<test::HMapFileMock<4, 128>, char> FileTy;
+ FileTy File;
+ File.init();
+
+ std::string HeaderDirName = "/tmp/Sources/Foo/Headers/";
+ std::string HeaderName = "Foo.h";
+#ifdef _WIN32
+ // Force header path to be absolute on windows.
+ // As headermap content should represent absolute locations.
+ HeaderDirName = "C:" + HeaderDirName;
+#endif /*_WIN32*/
+
+ test::HMapFileMockMaker<FileTy> Maker(File);
+ auto a = Maker.addString("Foo/Foo.h");
+ auto b = Maker.addString(HeaderDirName);
+ auto c = Maker.addString(HeaderName);
+ Maker.addBucket("Foo/Foo.h", a, b, c);
+ addHeaderMap("product-headers.hmap", File.getBuffer(), /*isAngled=*/true);
+
+ VFS->addFile(
+ HeaderDirName + HeaderName, 0,
+ llvm::MemoryBuffer::getMemBufferCopy("", HeaderDirName + HeaderName),
+ /*User=*/None, /*Group=*/None, llvm::sys::fs::file_type::regular_file);
+
+ bool IsMapped = false;
+ const DirectoryLookup *CurDir = nullptr;
+ auto FoundFile = Search.LookupFile(
+ "Foo/Foo.h", SourceLocation(), /*isAngled=*/true, /*FromDir=*/nullptr,
+ CurDir, /*Includers=*/{}, /*SearchPath=*/nullptr,
+ /*RelativePath=*/nullptr, /*RequestingModule=*/nullptr,
+ /*SuggestedModule=*/nullptr, &IsMapped,
+ /*IsFrameworkFound=*/nullptr);
+
+ EXPECT_TRUE(FoundFile.hasValue());
+ EXPECT_TRUE(IsMapped);
+ auto &FE = FoundFile.getValue();
+ auto FI = Search.getExistingFileInfo(FE);
+ EXPECT_TRUE(FI);
+ EXPECT_TRUE(FI->IsValid);
+ EXPECT_EQ(FI->Framework.str(), "Foo");
+}
+
} // namespace
} // namespace clang
Index: clang/lib/Lex/HeaderSearch.cpp
===================================================================
--- clang/lib/Lex/HeaderSearch.cpp
+++ clang/lib/Lex/HeaderSearch.cpp
@@ -1005,13 +1005,13 @@
// If this file is found in a header map and uses the framework style of
// includes, then this header is part of a framework we're building.
- if (CurDir->isIndexHeaderMap()) {
+ if (CurDir->isHeaderMap() && isAngled) {
size_t SlashPos = Filename.find('/');
- if (SlashPos != StringRef::npos) {
+ if (SlashPos != StringRef::npos)
+ HFI.Framework =
+ getUniqueFrameworkName(StringRef(Filename.begin(), SlashPos));
+ if (CurDir->isIndexHeaderMap())
HFI.IndexHeaderMapHeader = 1;
- HFI.Framework = getUniqueFrameworkName(StringRef(Filename.begin(),
- SlashPos));
- }
}
if (checkMSVCHeaderSearch(Diags, MSFE ? &MSFE->getFileEntry() : nullptr,
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
