usaxena95 updated this revision to Diff 513165.
usaxena95 added a comment.
More refactorings.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D148213/new/
https://reviews.llvm.org/D148213
Files:
clang-tools-extra/clangd/Diagnostics.cpp
clang-tools-extra/clangd/IncludeCleaner.cpp
clang-tools-extra/clangd/SourceCode.cpp
clang-tools-extra/clangd/SourceCode.h
clang-tools-extra/clangd/XRefs.cpp
clang-tools-extra/clangd/index/Background.cpp
clang-tools-extra/clangd/index/SymbolCollector.cpp
clang-tools-extra/clangd/indexer/IndexerMain.cpp
clang-tools-extra/clangd/refactor/Tweak.cpp
Index: clang-tools-extra/clangd/refactor/Tweak.cpp
===================================================================
--- clang-tools-extra/clangd/refactor/Tweak.cpp
+++ clang-tools-extra/clangd/refactor/Tweak.cpp
@@ -104,8 +104,9 @@
Tweak::Effect::fileEdit(const SourceManager &SM, FileID FID,
tooling::Replacements Replacements) {
Edit Ed(SM.getBufferData(FID), std::move(Replacements));
- if (auto FilePath = getCanonicalPath(SM.getFileEntryForID(FID), SM))
- return std::make_pair(*FilePath, std::move(Ed));
+ if (const auto FE = SM.getFileEntryRefForID(FID))
+ if (auto FilePath = getCanonicalPath(*FE, SM))
+ return std::make_pair(*FilePath, std::move(Ed));
return error("Failed to get absolute path for edited file: {0}",
SM.getFileEntryRefForID(FID)->getName());
}
Index: clang-tools-extra/clangd/indexer/IndexerMain.cpp
===================================================================
--- clang-tools-extra/clangd/indexer/IndexerMain.cpp
+++ clang-tools-extra/clangd/indexer/IndexerMain.cpp
@@ -46,10 +46,10 @@
SymbolCollector::Options Opts;
Opts.CountReferences = true;
Opts.FileFilter = [&](const SourceManager &SM, FileID FID) {
- const auto *F = SM.getFileEntryForID(FID);
+ const auto F = SM.getFileEntryRefForID(FID);
if (!F)
return false; // Skip invalid files.
- auto AbsPath = getCanonicalPath(F, SM);
+ auto AbsPath = getCanonicalPath(*F, SM);
if (!AbsPath)
return false; // Skip files without absolute path.
std::lock_guard<std::mutex> Lock(FilesMu);
Index: clang-tools-extra/clangd/index/SymbolCollector.cpp
===================================================================
--- clang-tools-extra/clangd/index/SymbolCollector.cpp
+++ clang-tools-extra/clangd/index/SymbolCollector.cpp
@@ -205,11 +205,11 @@
// Returns a canonical URI for the file \p FE.
// We attempt to make the path absolute first.
- const std::string &toURI(const FileEntry *FE) {
+ const std::string &toURI(const FileEntryRef &FE) {
auto R = CacheFEToURI.try_emplace(FE);
if (R.second) {
auto CanonPath = getCanonicalPath(FE, SM);
- R.first->second = &toURIInternal(CanonPath ? *CanonPath : FE->getName());
+ R.first->second = &toURIInternal(CanonPath ? *CanonPath : FE.getName());
}
return *R.first->second;
}
@@ -218,7 +218,7 @@
// If the file is in the FileManager, use that to canonicalize the path.
// We attempt to make the path absolute in any case.
const std::string &toURI(llvm::StringRef Path) {
- if (auto File = SM.getFileManager().getFile(Path))
+ if (auto File = SM.getFileManager().getFileRef(Path))
return toURI(*File);
return toURIInternal(Path);
}
@@ -373,7 +373,7 @@
}
llvm::StringRef getIncludeHeaderUncached(FileID FID) {
- const FileEntry *FE = SM.getFileEntryForID(FID);
+ const auto FE = SM.getFileEntryRefForID(FID);
if (!FE || FE->getName().empty())
return "";
llvm::StringRef Filename = FE->getName();
@@ -392,13 +392,15 @@
// Framework headers are spelled as <FrameworkName/Foo.h>, not
// "path/FrameworkName.framework/Headers/Foo.h".
auto &HS = PP->getHeaderSearchInfo();
- if (const auto *HFI = HS.getExistingFileInfo(FE, /*WantExternal*/ false))
+ if (const auto *HFI = HS.getExistingFileInfo(&FE->getFileEntry(),
+ /*WantExternal*/ false))
if (!HFI->Framework.empty())
- if (auto Spelling =
- getFrameworkHeaderIncludeSpelling(FE, HFI->Framework, HS))
+ if (auto Spelling = getFrameworkHeaderIncludeSpelling(
+ &FE->getFileEntry(), HFI->Framework, HS))
return *Spelling;
- if (!tooling::isSelfContainedHeader(FE, PP->getSourceManager(),
+ if (!tooling::isSelfContainedHeader(&FE->getFileEntry(),
+ PP->getSourceManager(),
PP->getHeaderSearchInfo())) {
// A .inc or .def file is often included into a real header to define
// symbols (e.g. LLVM tablegen files).
@@ -409,7 +411,7 @@
return "";
}
// Standard case: just insert the file itself.
- return toURI(FE);
+ return toURI(*FE);
}
};
@@ -417,12 +419,12 @@
std::optional<SymbolLocation>
SymbolCollector::getTokenLocation(SourceLocation TokLoc) {
const auto &SM = ASTCtx->getSourceManager();
- auto *FE = SM.getFileEntryForID(SM.getFileID(TokLoc));
+ const auto FE = SM.getFileEntryRefForID(SM.getFileID(TokLoc));
if (!FE)
return std::nullopt;
SymbolLocation Result;
- Result.FileURI = HeaderFileURIs->toURI(FE).c_str();
+ Result.FileURI = HeaderFileURIs->toURI(*FE).c_str();
auto Range = getTokenRange(TokLoc, SM, ASTCtx->getLangOpts());
Result.Start = Range.first;
Result.End = Range.second;
@@ -635,10 +637,10 @@
void SymbolCollector::handleMacros(const MainFileMacros &MacroRefsToIndex) {
assert(HeaderFileURIs && PP);
const auto &SM = PP->getSourceManager();
- const auto *MainFileEntry = SM.getFileEntryForID(SM.getMainFileID());
- assert(MainFileEntry);
+ const auto MainFileEntryRef = SM.getFileEntryRefForID(SM.getMainFileID());
+ assert(MainFileEntryRef);
- const std::string &MainFileURI = HeaderFileURIs->toURI(MainFileEntry);
+ const std::string &MainFileURI = HeaderFileURIs->toURI(*MainFileEntryRef);
// Add macro references.
for (const auto &IDToRefs : MacroRefsToIndex.MacroRefs) {
for (const auto &MacroRef : IDToRefs.second) {
@@ -985,12 +987,12 @@
const auto &SM = ASTCtx->getSourceManager();
// FIXME: use the result to filter out references.
shouldIndexFile(SR.FID);
- if (const auto *FE = SM.getFileEntryForID(SR.FID)) {
+ if (const auto FE = SM.getFileEntryRefForID(SR.FID)) {
auto Range = getTokenRange(SR.Loc, SM, ASTCtx->getLangOpts());
Ref R;
R.Location.Start = Range.first;
R.Location.End = Range.second;
- R.Location.FileURI = HeaderFileURIs->toURI(FE).c_str();
+ R.Location.FileURI = HeaderFileURIs->toURI(*FE).c_str();
R.Kind = toRefKind(SR.Roles, SR.Spelled);
R.Container = getSymbolIDCached(SR.Container);
Refs.insert(ID, R);
Index: clang-tools-extra/clangd/index/Background.cpp
===================================================================
--- clang-tools-extra/clangd/index/Background.cpp
+++ clang-tools-extra/clangd/index/Background.cpp
@@ -288,10 +288,10 @@
// digests.
IndexOpts.FileFilter = [&ShardVersionsSnapshot](const SourceManager &SM,
FileID FID) {
- const auto *F = SM.getFileEntryForID(FID);
+ const auto F = SM.getFileEntryRefForID(FID);
if (!F)
return false; // Skip invalid files.
- auto AbsPath = getCanonicalPath(F, SM);
+ auto AbsPath = getCanonicalPath(*F, SM);
if (!AbsPath)
return false; // Skip files without absolute path.
auto Digest = digestFile(SM, FID);
Index: clang-tools-extra/clangd/XRefs.cpp
===================================================================
--- clang-tools-extra/clangd/XRefs.cpp
+++ clang-tools-extra/clangd/XRefs.cpp
@@ -208,10 +208,10 @@
std::optional<Location> makeLocation(const ASTContext &AST, SourceLocation Loc,
llvm::StringRef TUPath) {
const auto &SM = AST.getSourceManager();
- const FileEntry *F = SM.getFileEntryForID(SM.getFileID(Loc));
+ const auto F = SM.getFileEntryRefForID(SM.getFileID(Loc));
if (!F)
return std::nullopt;
- auto FilePath = getCanonicalPath(F, SM);
+ auto FilePath = getCanonicalPath(*F, SM);
if (!FilePath) {
log("failed to get path!");
return std::nullopt;
@@ -1617,8 +1617,10 @@
toHalfOpenFileRange(SM, Ctx.getLangOpts(), {BeginLoc, EndLoc});
if (!DeclRange)
return std::nullopt;
- auto FilePath =
- getCanonicalPath(SM.getFileEntryForID(SM.getFileID(NameLoc)), SM);
+ const auto FE = SM.getFileEntryRefForID(SM.getFileID(NameLoc));
+ if (!FE)
+ return std::nullopt;
+ auto FilePath = getCanonicalPath(*FE, SM);
if (!FilePath)
return std::nullopt; // Not useful without a uri.
@@ -1968,7 +1970,8 @@
return unwrapFindType(FT->getReturnType(), H, Out);
if (auto *CRD = T->getAsCXXRecordDecl()) {
if (CRD->isLambda())
- return unwrapFindType(CRD->getLambdaCallOperator()->getReturnType(), H, Out);
+ return unwrapFindType(CRD->getLambdaCallOperator()->getReturnType(), H,
+ Out);
// FIXME: more cases we'd prefer the return type of the call operator?
// std::function etc?
}
Index: clang-tools-extra/clangd/SourceCode.h
===================================================================
--- clang-tools-extra/clangd/SourceCode.h
+++ clang-tools-extra/clangd/SourceCode.h
@@ -163,7 +163,7 @@
/// This function should be used when paths needs to be used outside the
/// component that generate it, so that paths are normalized as much as
/// possible.
-std::optional<std::string> getCanonicalPath(const FileEntry *F,
+std::optional<std::string> getCanonicalPath(const FileEntryRef &F,
const SourceManager &SourceMgr);
/// Choose the clang-format style we should apply to a certain file.
Index: clang-tools-extra/clangd/SourceCode.cpp
===================================================================
--- clang-tools-extra/clangd/SourceCode.cpp
+++ clang-tools-extra/clangd/SourceCode.cpp
@@ -12,6 +12,7 @@
#include "Protocol.h"
#include "support/Context.h"
#include "support/Logger.h"
+#include "clang/Basic/FileEntry.h"
#include "clang/Basic/LangOptions.h"
#include "clang/Basic/SourceLocation.h"
#include "clang/Basic/SourceManager.h"
@@ -512,12 +513,12 @@
return Edits;
}
-std::optional<std::string> getCanonicalPath(const FileEntry *F,
+std::optional<std::string> getCanonicalPath(const FileEntryRef& F,
const SourceManager &SourceMgr) {
if (!F)
return std::nullopt;
- llvm::SmallString<128> FilePath = F->getName();
+ llvm::SmallString<128> FilePath = F.getName();
if (!llvm::sys::path::is_absolute(FilePath)) {
if (auto EC =
SourceMgr.getFileManager().getVirtualFileSystem().makeAbsolute(
Index: clang-tools-extra/clangd/IncludeCleaner.cpp
===================================================================
--- clang-tools-extra/clangd/IncludeCleaner.cpp
+++ clang-tools-extra/clangd/IncludeCleaner.cpp
@@ -151,8 +151,9 @@
std::string spellHeader(ParsedAST &AST, const FileEntry *MainFile,
include_cleaner::Header Provider) {
if (Provider.kind() == include_cleaner::Header::Physical) {
- if (auto CanonicalPath =
- getCanonicalPath(Provider.physical(), AST.getSourceManager())) {
+ // DO NOT SUBMIT: Should be change `physical` to FileEntryRef as well ?
+ if (auto CanonicalPath = getCanonicalPath(Provider.physical()->getLastRef(),
+ AST.getSourceManager())) {
std::string SpelledHeader =
llvm::cantFail(URI::includeSpelling(URI::create(*CanonicalPath)));
if (!SpelledHeader.empty())
Index: clang-tools-extra/clangd/Diagnostics.cpp
===================================================================
--- clang-tools-extra/clangd/Diagnostics.cpp
+++ clang-tools-extra/clangd/Diagnostics.cpp
@@ -715,9 +715,9 @@
D.InsideMainFile = isInsideMainFile(PatchLoc, SM);
D.Range = diagnosticRange(Info, *LangOpts);
auto FID = SM.getFileID(Info.getLocation());
- if (auto *FE = SM.getFileEntryForID(FID)) {
+ if (const auto FE = SM.getFileEntryRefForID(FID)) {
D.File = FE->getName().str();
- D.AbsFile = getCanonicalPath(FE, SM);
+ D.AbsFile = getCanonicalPath(*FE, SM);
}
D.ID = Info.getID();
return D;
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
