rmaz created this revision.
Herald added a subscriber: mgrang.
Herald added a project: All.
rmaz requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Refactor `FileManager::GetUniqueIDMapping` to populate an array of
`OptionalFileEntryRefDegradesToFileEntryPtr` instead of UID to
`FileEntry *`. This should allow the path serialization of input files
to use the paths used when looking up a file entry, instead of the
last reference.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D143414
Files:
clang/include/clang/Basic/FileManager.h
clang/lib/Basic/FileManager.cpp
clang/lib/Serialization/ASTWriter.cpp
Index: clang/lib/Serialization/ASTWriter.cpp
===================================================================
--- clang/lib/Serialization/ASTWriter.cpp
+++ clang/lib/Serialization/ASTWriter.cpp
@@ -36,6 +36,7 @@
#include "clang/AST/TypeLocVisitor.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/DiagnosticOptions.h"
+#include "clang/Basic/FileEntry.h"
#include "clang/Basic/FileManager.h"
#include "clang/Basic/FileSystemOptions.h"
#include "clang/Basic/IdentifierTable.h"
@@ -169,17 +170,10 @@
const HeaderSearch &HS = PP.getHeaderSearchInfo();
- SmallVector<const FileEntry *, 16> FilesByUID;
- HS.getFileMgr().GetUniqueIDMapping(FilesByUID);
-
- if (FilesByUID.size() > HS.header_file_size())
- FilesByUID.resize(HS.header_file_size());
-
- for (unsigned UID = 0, LastUID = FilesByUID.size(); UID != LastUID; ++UID) {
- const FileEntry *File = FilesByUID[UID];
- if (!File)
- continue;
+ SmallVector<OptionalFileEntryRefDegradesToFileEntryPtr, 16> FileEntries;
+ HS.getFileMgr().getSeenFileEntries(FileEntries);
+ for (auto File : FileEntries) {
const HeaderFileInfo *HFI =
HS.getExistingFileInfo(File, /*WantExternal*/ false);
if (!HFI || (HFI->isModuleHeader && !HFI->isCompilingModuleHeader))
@@ -1918,16 +1912,14 @@
}
}
- SmallVector<const FileEntry *, 16> FilesByUID;
- HS.getFileMgr().GetUniqueIDMapping(FilesByUID);
-
- if (FilesByUID.size() > HS.header_file_size())
- FilesByUID.resize(HS.header_file_size());
+ SmallVector<OptionalFileEntryRefDegradesToFileEntryPtr, 16> FileEntries;
+ HS.getFileMgr().getSeenFileEntries(FileEntries);
+ llvm::sort(FileEntries, [](OptionalFileEntryRefDegradesToFileEntryPtr &A,
+ OptionalFileEntryRefDegradesToFileEntryPtr &B) {
+ return A->getName() < B->getName();
+ });
- for (unsigned UID = 0, LastUID = FilesByUID.size(); UID != LastUID; ++UID) {
- const FileEntry *File = FilesByUID[UID];
- if (!File)
- continue;
+ for (auto File : FileEntries) {
// Get the file info. This will load info from the external source if
// necessary. Skip emitting this file if we have no information on it
Index: clang/lib/Basic/FileManager.cpp
===================================================================
--- clang/lib/Basic/FileManager.cpp
+++ clang/lib/Basic/FileManager.cpp
@@ -17,6 +17,7 @@
//===----------------------------------------------------------------------===//
#include "clang/Basic/FileManager.h"
+#include "clang/Basic/FileEntry.h"
#include "clang/Basic/FileSystemStatCache.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallString.h"
@@ -611,25 +612,22 @@
return std::error_code();
}
-void FileManager::GetUniqueIDMapping(
- SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
- UIDToFiles.clear();
- UIDToFiles.resize(NextFileUID);
-
- // Map file entries
- for (llvm::StringMap<llvm::ErrorOr<FileEntryRef::MapValue>,
- llvm::BumpPtrAllocator>::const_iterator
- FE = SeenFileEntries.begin(),
- FEEnd = SeenFileEntries.end();
- FE != FEEnd; ++FE)
- if (llvm::ErrorOr<FileEntryRef::MapValue> Entry = FE->getValue()) {
- if (const auto *FE = Entry->V.dyn_cast<FileEntry *>())
- UIDToFiles[FE->getUID()] = FE;
+void FileManager::getSeenFileEntries(
+ SmallVectorImpl<OptionalFileEntryRefDegradesToFileEntryPtr> &Entries)
+ const {
+ Entries.reserve(SeenFileEntries.size());
+
+ for (const auto &Entry : SeenFileEntries) {
+ if (llvm::ErrorOr<FileEntryRef::MapValue> Value = Entry.getValue()) {
+ if (const auto *FE = Value->V.dyn_cast<FileEntry *>()) {
+ Entries.push_back(FileEntryRef(Entry));
+ } else {
+ Entries.push_back(
+ FileEntryRef(*reinterpret_cast<const FileEntryRef::MapEntry *>(
+ Value->V.get<const void *>())));
+ }
}
-
- // Map virtual file entries
- for (const auto &VFE : VirtualFileEntries)
- UIDToFiles[VFE->getUID()] = VFE;
+ }
}
StringRef FileManager::getCanonicalName(const DirectoryEntry *Dir) {
Index: clang/include/clang/Basic/FileManager.h
===================================================================
--- clang/include/clang/Basic/FileManager.h
+++ clang/include/clang/Basic/FileManager.h
@@ -312,8 +312,9 @@
/// Produce an array mapping from the unique IDs assigned to each
/// file to the corresponding FileEntry pointer.
- void GetUniqueIDMapping(
- SmallVectorImpl<const FileEntry *> &UIDToFiles) const;
+ void getSeenFileEntries(
+ SmallVectorImpl<OptionalFileEntryRefDegradesToFileEntryPtr> &Entries)
+ const;
/// Retrieve the canonical name for a given directory.
///
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
