From 009f91a9ee873d8511d8fd017a5f7a6c046b642f Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Tue, 3 Jun 2014 08:12:33 +0000 Subject: [PATCH] Rename FileToMutable -> SimpleFileWrapper. FileToMutable is what this class does, but this class (or, to be precise, an instance of this class) is a wrapper of the other SimpleFile. It's odd that the class was named like a function. llvm-svn: 210089 --- lld/include/lld/ReaderWriter/Simple.h | 4 ++-- lld/lib/Passes/RoundTripNativePass.cpp | 2 +- lld/lib/Passes/RoundTripYAMLPass.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lld/include/lld/ReaderWriter/Simple.h b/lld/include/lld/ReaderWriter/Simple.h index 03e8783..58bab73 100644 --- a/lld/include/lld/ReaderWriter/Simple.h +++ b/lld/include/lld/ReaderWriter/Simple.h @@ -66,9 +66,9 @@ protected: atom_collection_vector _absoluteAtoms; }; -class FileToMutable : public SimpleFile { +class SimpleFileWrapper : public SimpleFile { public: - FileToMutable(const LinkingContext &context, const File &file) + SimpleFileWrapper(const LinkingContext &context, const File &file) : SimpleFile(file.path()) { for (auto definedAtom : file.defined()) _definedAtoms._atoms.push_back(std::move(definedAtom)); diff --git a/lld/lib/Passes/RoundTripNativePass.cpp b/lld/lib/Passes/RoundTripNativePass.cpp index 42e22d4..724baad 100644 --- a/lld/lib/Passes/RoundTripNativePass.cpp +++ b/lld/lib/Passes/RoundTripNativePass.cpp @@ -47,7 +47,7 @@ void RoundTripNativePass::perform(std::unique_ptr &mergedFile) { llvm_unreachable("native reader not registered or read error"); } File *objFile = _nativeFile[0].get(); - mergedFile.reset(new FileToMutable(_context, *objFile)); + mergedFile.reset(new SimpleFileWrapper(_context, *objFile)); llvm::sys::fs::remove(tmpNativeFile.str()); } diff --git a/lld/lib/Passes/RoundTripYAMLPass.cpp b/lld/lib/Passes/RoundTripYAMLPass.cpp index a01753a..ba9926a 100644 --- a/lld/lib/Passes/RoundTripYAMLPass.cpp +++ b/lld/lib/Passes/RoundTripYAMLPass.cpp @@ -46,6 +46,6 @@ void RoundTripYAMLPass::perform(std::unique_ptr &mergedFile) { llvm_unreachable("yaml reader not registered or read error"); } File *objFile = _yamlFile[0].get(); - mergedFile.reset(new FileToMutable(_context, *objFile)); + mergedFile.reset(new SimpleFileWrapper(_context, *objFile)); llvm::sys::fs::remove(tmpYAMLFile.str()); } -- 2.7.4