This is an archive of the discontinued LLVM Phabricator instance.

Differential D59079

[clang][Tooling] Delete dots and dotdots when generating absolute paths
ClosedPublic

Authored by kadircet on Mar 7 2019, 1:46 AM.

Details

Reviewers
hokein
Commits
rG7ec1ec10c97f: [clang][Tooling] Delete dots and dotdots when generating absolute paths
rC355678: [clang][Tooling] Delete dots and dotdots when generating absolute paths
rL355678: [clang][Tooling] Delete dots and dotdots when generating absolute paths
Summary

GetAllFiles interface returns absolute paths, but keeps dots and dot
dots. This patch makes those paths canonical by deleting them.

Diff Detail

Repository
rL LLVM

Event Timeline

kadircet created this revision.Mar 7 2019, 1:46 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 7 2019, 1:46 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B28879: Diff 189663.Mar 7 2019, 1:47 AM
hokein accepted this revision.Mar 7 2019, 1:59 AM
hokein added inline comments.
lib/Tooling/JSONCompilationDatabase.cpp
373 ↗(On Diff #189663)

nit: add the /*remove_dot_dot=*/ for the true parameter.

This revision is now accepted and ready to land.Mar 7 2019, 1:59 AM
Closed by commit rL355678: [clang][Tooling] Delete dots and dotdots when generating absolute paths (authored by kadircet). · Explain WhyMar 8 2019, 1:41 AM
This revision was automatically updated to reflect the committed changes.
kadircet marked an inline comment as done.
Herald added a project: Restricted Project. · View Herald TranscriptMar 8 2019, 1:41 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
cfe/
trunk/
lib/
Tooling/
1 line
unittests/
Tooling/
5 lines

Diff 189829

cfe/trunk/lib/Tooling/JSONCompilationDatabase.cpp

Show First 20 Lines • Show All 364 Lines • ▼ Show 20 Lines for (auto &NextObject : *Array) {
SmallString<8> FileStorage; SmallString<8> FileStorage;
StringRef FileName = File->getValue(FileStorage); StringRef FileName = File->getValue(FileStorage);
SmallString<128> NativeFilePath; SmallString<128> NativeFilePath;
if (llvm::sys::path::is_relative(FileName)) { if (llvm::sys::path::is_relative(FileName)) {
SmallString<8> DirectoryStorage; SmallString<8> DirectoryStorage;
SmallString<128> AbsolutePath( SmallString<128> AbsolutePath(
Directory->getValue(DirectoryStorage)); Directory->getValue(DirectoryStorage));
llvm::sys::path::append(AbsolutePath, FileName); llvm::sys::path::append(AbsolutePath, FileName);
llvm::sys::path::remove_dots(AbsolutePath, /*remove_dot_dot=*/ true);
llvm::sys::path::native(AbsolutePath, NativeFilePath); llvm::sys::path::native(AbsolutePath, NativeFilePath);
} else { } else {
llvm::sys::path::native(FileName, NativeFilePath); llvm::sys::path::native(FileName, NativeFilePath);
} }
auto Cmd = CompileCommandRef(Directory, File, *Command, Output); auto Cmd = CompileCommandRef(Directory, File, *Command, Output);
IndexByFile[NativeFilePath].push_back(Cmd); IndexByFile[NativeFilePath].push_back(Cmd);
AllCommands.push_back(Cmd); AllCommands.push_back(Cmd);
MatchTrie.insert(NativeFilePath); MatchTrie.insert(NativeFilePath);
} }
return true; return true;
} }

cfe/trunk/unittests/Tooling/CompilationDatabaseTest.cpp

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines EXPECT_EQ(std::vector<std::string>(),
<< ErrorMessage; << ErrorMessage;
std::vector<std::string> expected_files; std::vector<std::string> expected_files;
SmallString<16> PathStorage; SmallString<16> PathStorage;
llvm::sys::path::native("//net/dir/file1", PathStorage); llvm::sys::path::native("//net/dir/file1", PathStorage);
expected_files.push_back(PathStorage.str()); expected_files.push_back(PathStorage.str());
llvm::sys::path::native("//net/dir/file2", PathStorage); llvm::sys::path::native("//net/dir/file2", PathStorage);
expected_files.push_back(PathStorage.str()); expected_files.push_back(PathStorage.str());
llvm::sys::path::native("//net/file1", PathStorage);
expected_files.push_back(PathStorage.str());
EXPECT_EQ(expected_files, EXPECT_EQ(expected_files,
getAllFiles("[{\"directory\":\"//net/dir\"," getAllFiles("[{\"directory\":\"//net/dir\","
"\"command\":\"command\"," "\"command\":\"command\","
"\"file\":\"file1\"}," "\"file\":\"file1\"},"
" {\"directory\":\"//net/dir\"," " {\"directory\":\"//net/dir\","
"\"command\":\"command\"," "\"command\":\"command\","
"\"file\":\"../file1\"},"
" {\"directory\":\"//net/dir\","
"\"command\":\"command\","
"\"file\":\"file2\"}]", "\"file\":\"file2\"}]",
ErrorMessage, JSONCommandLineSyntax::Gnu)) ErrorMessage, JSONCommandLineSyntax::Gnu))
<< ErrorMessage; << ErrorMessage;
} }
TEST(JSONCompilationDatabase, GetAllCompileCommands) { TEST(JSONCompilationDatabase, GetAllCompileCommands) {
std::string ErrorMessage; std::string ErrorMessage;
EXPECT_EQ( EXPECT_EQ(
▲ Show 20 Lines • Show All 677 Lines • Show Last 20 Lines