[PATCH] D19647: [find-all-symbols] Save absolute file path instead of relative file path in SymbolInfo.
Haojian Wu via cfe-commits
cfe-commits at lists.llvm.org
Thu Apr 28 04:58:40 PDT 2016
hokein updated this revision to Diff 55398.
hokein added a comment.
Don't append absolute path to build directory.
We will get the absolute file paths in some cases, such as STL.
http://reviews.llvm.org/D19647
Files:
include-fixer/find-all-symbols/FindAllSymbols.cpp
Index: include-fixer/find-all-symbols/FindAllSymbols.cpp
===================================================================
--- include-fixer/find-all-symbols/FindAllSymbols.cpp
+++ include-fixer/find-all-symbols/FindAllSymbols.cpp
@@ -16,6 +16,7 @@
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Tooling/Tooling.h"
#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/Path.h"
using namespace clang::ast_matchers;
@@ -47,19 +48,37 @@
SetContext(ND, Symbol);
Symbol->Name = ND->getNameAsString();
- SourceLocation Loc = Result.SourceManager->getExpansionLoc(ND->getLocation());
+
+ const SourceManager *SM = Result.SourceManager;
+ SourceLocation Loc = SM->getExpansionLoc(ND->getLocation());
if (!Loc.isValid()) {
llvm::errs() << "Declaration " << ND->getNameAsString() << "("
<< ND->getDeclKindName()
<< ") has invalid declaration location.";
return false;
}
- std::string FilePath = Result.SourceManager->getFilename(Loc).str();
+
+ Symbol->LineNumber = SM->getExpansionLineNumber(Loc);
+
+ llvm::StringRef FilePath = SM->getFilename(Loc);
if (FilePath.empty())
return false;
- Symbol->FilePath = FilePath;
- Symbol->LineNumber = Result.SourceManager->getExpansionLineNumber(Loc);
+ llvm::SmallString<128> AbsolutePath;
+ if (llvm::sys::path::is_absolute(FilePath)) {
+ AbsolutePath = FilePath;
+ } else {
+ auto WorkingDir = SM->getFileManager()
+ .getVirtualFileSystem()
+ ->getCurrentWorkingDirectory();
+ if (!WorkingDir)
+ return false;
+ AbsolutePath = *WorkingDir;
+ llvm::sys::path::append(AbsolutePath, FilePath);
+ }
+
+ llvm::sys::path::remove_dots(AbsolutePath, true);
+ Symbol->FilePath = AbsolutePath.str();
return true;
}
} // namespace
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D19647.55398.patch
Type: text/x-patch
Size: 1842 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20160428/4016fb1a/attachment.bin>
More information about the cfe-commits
mailing list