maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert commit r192299 until find a way to account for simlinks in OS X. 

llvm-svn: 192313
This commit is contained in:
Ariel J. Bernal 2013-10-09 18:27:27 +00:00
parent b648732230
commit e7288fe233
2 changed files with 4 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

53
clang/unittests/Tooling/RefactoringTest.cpp
View File

@ -244,10 +244,6 @@ public:
return Context.Sources.createFileID(File, SourceLocation(), SrcMgr::C_User); return Context.Sources.createFileID(File, SourceLocation(), SrcMgr::C_User);
} }
StringRef getFilePath(llvm::StringRef Name) {
return TemporaryFiles.lookup(Name);
}
std::string getFileContentFromDisk(llvm::StringRef Name) { std::string getFileContentFromDisk(llvm::StringRef Name) {
std::string Path = TemporaryFiles.lookup(Name); std::string Path = TemporaryFiles.lookup(Name);
assert(!Path.empty()); assert(!Path.empty());
@ -274,55 +270,6 @@ TEST_F(FlushRewrittenFilesTest, StoresChangesOnDisk) {
getFileContentFromDisk("input.cpp")); getFileContentFromDisk("input.cpp"));
} }
TEST_F(FlushRewrittenFilesTest, GetFilePath) {
// Create a temporary file.
createFile("input.cpp", "line1\nline2\nline3\nline4");
StringRef FilePath = getFilePath("input.cpp");
StringRef TempPath = llvm::sys::path::parent_path(FilePath);
StringRef TempFile = llvm::sys::path::filename(FilePath);
// Save current path.
SmallString<512> CurrentPath;
llvm::sys::fs::current_path(CurrentPath);
// Change directory to the temporary directory.
EXPECT_FALSE(chdir(TempPath.str().c_str()));
llvm::sys::fs::current_path(CurrentPath);
// Get a FileEntry from the current directory.
FileManager Files((FileSystemOptions()));
const FileEntry *Entry = Files.getFile(TempFile);
ASSERT_TRUE(Entry != NULL);
// We expect to get just the filename and "." in the FileEntry
// since paths are relative to the current directory.
EXPECT_EQ(TempFile, Entry->getName());
EXPECT_STREQ(".", Entry->getDir()->getName());
FileID ID = Context.Sources.createFileID(Entry, SourceLocation(),
SrcMgr::C_User);
Replacement R = Replacement(Context.Sources, Context.getLocation(ID, 2, 1),
5, "replaced");
// Change back to the original path so we can verify that replacements
// are being applied independently of the location.
EXPECT_EQ(0, chdir(CurrentPath.c_str()));
// We expect that the file path of the replacement is using the absolute
// path.
EXPECT_EQ(R.getFilePath(), getFilePath("input.cpp"));
// Apply replacements.
Replacements Replaces;
Replaces.insert(R);
EXPECT_TRUE(applyAllReplacements(Replaces, Context.Rewrite));
EXPECT_FALSE(Context.Rewrite.overwriteChangedFiles());
EXPECT_EQ("line1\nreplaced\nline3\nline4",
getFileContentFromDisk("input.cpp"));
}
namespace { namespace {
template <typename T> template <typename T>
class TestVisitor : public clang::RecursiveASTVisitor<T> { class TestVisitor : public clang::RecursiveASTVisitor<T> {