nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This patch fixes replacements that are not applied when relative paths are

Browse Source 
specified.

In particular it makes sure that  relative paths for non-virtual files aren't
made absolute.
Added unittest.

llvm-svn: 192992
This commit is contained in:
Ariel J. Bernal
2013-10-18 18:38:24 +00:00
parent 11a66c1240
commit 4dc53c20fc
2 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/Tooling/Refactoring.cpp
View File

@@ -107,10 +107,16 @@ void Replacement::setFromSourceLocation(SourceManager &Sources,
const FileEntry *Entry = Sources.getFileEntryForID(DecomposedLocation.first);
if (Entry != NULL) {
// Make FilePath absolute so replacements can be applied correctly when
// relative paths for files are used.
llvm::SmallString<256> FilePath(Entry->getName());
llvm::error_code EC = llvm::sys::fs::make_absolute(FilePath);
this->FilePath = EC ? FilePath.c_str() : Entry->getName();
// relative paths for files are used. But we don't want to change virtual
// files.
if (llvm::sys::fs::exists(Entry->getName())) {
llvm::SmallString<256> FilePath(Entry->getName());
llvm::sys::fs::make_absolute(FilePath);
this->FilePath = FilePath.c_str();
}
else {
this->FilePath = Entry->getName();
}
} else {
this->FilePath = InvalidLocation;
}