[llvm] r212302 - LTO: rename the various makeLTOModule overloads.
Peter Collingbourne
peter at pcc.me.uk
Thu Jul 3 16:28:00 PDT 2014
Author: pcc
Date: Thu Jul 3 18:28:00 2014
New Revision: 212302
URL: http://llvm.org/viewvc/llvm-project?rev=212302&view=rev
Log:
LTO: rename the various makeLTOModule overloads.
This rename makes it easier to identify the specific overload being called
in each particular case and makes future refactorings easier.
Differential Revision: http://reviews.llvm.org/D4370
Modified:
llvm/trunk/include/llvm/LTO/LTOModule.h
llvm/trunk/lib/LTO/LTOModule.cpp
llvm/trunk/tools/gold/gold-plugin.cpp
llvm/trunk/tools/llvm-lto/llvm-lto.cpp
llvm/trunk/tools/lto/lto.cpp
Modified: llvm/trunk/include/llvm/LTO/LTOModule.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/LTO/LTOModule.h?rev=212302&r1=212301&r2=212302&view=diff
==============================================================================
--- llvm/trunk/include/llvm/LTO/LTOModule.h (original)
+++ llvm/trunk/include/llvm/LTO/LTOModule.h Thu Jul 3 18:28:00 2014
@@ -86,16 +86,18 @@ public:
/// InitializeAllTargetMCs();
/// InitializeAllAsmPrinters();
/// InitializeAllAsmParsers();
- static LTOModule *makeLTOModule(const char *path, TargetOptions options,
- std::string &errMsg);
- static LTOModule *makeLTOModule(int fd, const char *path, size_t size,
- TargetOptions options, std::string &errMsg);
- static LTOModule *makeLTOModule(int fd, const char *path, size_t map_size,
- off_t offset, TargetOptions options,
- std::string &errMsg);
- static LTOModule *makeLTOModule(const void *mem, size_t length,
- TargetOptions options, std::string &errMsg,
- StringRef path = "");
+ static LTOModule *createFromFile(const char *path, TargetOptions options,
+ std::string &errMsg);
+ static LTOModule *createFromOpenFile(int fd, const char *path, size_t size,
+ TargetOptions options,
+ std::string &errMsg);
+ static LTOModule *createFromOpenFileSlice(int fd, const char *path,
+ size_t map_size, off_t offset,
+ TargetOptions options,
+ std::string &errMsg);
+ static LTOModule *createFromBuffer(const void *mem, size_t length,
+ TargetOptions options, std::string &errMsg,
+ StringRef path = "");
/// Return the Module's target triple.
const char *getTargetTriple() {
Modified: llvm/trunk/lib/LTO/LTOModule.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LTO/LTOModule.cpp?rev=212302&r1=212301&r2=212302&view=diff
==============================================================================
--- llvm/trunk/lib/LTO/LTOModule.cpp (original)
+++ llvm/trunk/lib/LTO/LTOModule.cpp Thu Jul 3 18:28:00 2014
@@ -94,10 +94,8 @@ bool LTOModule::isTargetMatch(MemoryBuff
return strncmp(Triple.c_str(), triplePrefix, strlen(triplePrefix)) == 0;
}
-/// makeLTOModule - Create an LTOModule. N.B. These methods take ownership of
-/// the buffer.
-LTOModule *LTOModule::makeLTOModule(const char *path, TargetOptions options,
- std::string &errMsg) {
+LTOModule *LTOModule::createFromFile(const char *path, TargetOptions options,
+ std::string &errMsg) {
std::unique_ptr<MemoryBuffer> buffer;
if (std::error_code ec = MemoryBuffer::getFile(path, buffer)) {
errMsg = ec.message();
@@ -106,17 +104,16 @@ LTOModule *LTOModule::makeLTOModule(cons
return makeLTOModule(std::move(buffer), options, errMsg);
}
-LTOModule *LTOModule::makeLTOModule(int fd, const char *path,
- size_t size, TargetOptions options,
- std::string &errMsg) {
- return makeLTOModule(fd, path, size, 0, options, errMsg);
+LTOModule *LTOModule::createFromOpenFile(int fd, const char *path, size_t size,
+ TargetOptions options,
+ std::string &errMsg) {
+ return createFromOpenFileSlice(fd, path, size, 0, options, errMsg);
}
-LTOModule *LTOModule::makeLTOModule(int fd, const char *path,
- size_t map_size,
- off_t offset,
- TargetOptions options,
- std::string &errMsg) {
+LTOModule *LTOModule::createFromOpenFileSlice(int fd, const char *path,
+ size_t map_size, off_t offset,
+ TargetOptions options,
+ std::string &errMsg) {
std::unique_ptr<MemoryBuffer> buffer;
if (std::error_code ec =
MemoryBuffer::getOpenFileSlice(fd, path, buffer, map_size, offset)) {
@@ -126,9 +123,9 @@ LTOModule *LTOModule::makeLTOModule(int
return makeLTOModule(std::move(buffer), options, errMsg);
}
-LTOModule *LTOModule::makeLTOModule(const void *mem, size_t length,
- TargetOptions options,
- std::string &errMsg, StringRef path) {
+LTOModule *LTOModule::createFromBuffer(const void *mem, size_t length,
+ TargetOptions options,
+ std::string &errMsg, StringRef path) {
std::unique_ptr<MemoryBuffer> buffer(makeBuffer(mem, length, path));
if (!buffer)
return nullptr;
Modified: llvm/trunk/tools/gold/gold-plugin.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/gold-plugin.cpp?rev=212302&r1=212301&r2=212302&view=diff
==============================================================================
--- llvm/trunk/tools/gold/gold-plugin.cpp (original)
+++ llvm/trunk/tools/gold/gold-plugin.cpp Thu Jul 3 18:28:00 2014
@@ -292,7 +292,7 @@ static ld_plugin_status claim_file_hook(
return LDPS_OK;
std::string Error;
- M = LTOModule::makeLTOModule(view, file->filesize, TargetOpts, Error);
+ M = LTOModule::createFromBuffer(view, file->filesize, TargetOpts, Error);
if (!M) {
(*message)(LDPL_ERROR,
"LLVM gold plugin has failed to create LTO module: %s",
Modified: llvm/trunk/tools/llvm-lto/llvm-lto.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-lto/llvm-lto.cpp?rev=212302&r1=212301&r2=212302&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-lto/llvm-lto.cpp (original)
+++ llvm/trunk/tools/llvm-lto/llvm-lto.cpp Thu Jul 3 18:28:00 2014
@@ -110,7 +110,7 @@ int main(int argc, char **argv) {
for (unsigned i = BaseArg; i < InputFilenames.size(); ++i) {
std::string error;
std::unique_ptr<LTOModule> Module(
- LTOModule::makeLTOModule(InputFilenames[i].c_str(), Options, error));
+ LTOModule::createFromFile(InputFilenames[i].c_str(), Options, error));
if (!error.empty()) {
errs() << argv[0] << ": error loading file '" << InputFilenames[i]
<< "': " << error << "\n";
Modified: llvm/trunk/tools/lto/lto.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/lto.cpp?rev=212302&r1=212301&r2=212302&view=diff
==============================================================================
--- llvm/trunk/tools/lto/lto.cpp (original)
+++ llvm/trunk/tools/lto/lto.cpp Thu Jul 3 18:28:00 2014
@@ -104,14 +104,14 @@ lto_module_is_object_file_in_memory_for_
lto_module_t lto_module_create(const char* path) {
lto_initialize();
llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags();
- return wrap(LTOModule::makeLTOModule(path, Options, sLastErrorString));
+ return wrap(LTOModule::createFromFile(path, Options, sLastErrorString));
}
lto_module_t lto_module_create_from_fd(int fd, const char *path, size_t size) {
lto_initialize();
llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags();
return wrap(
- LTOModule::makeLTOModule(fd, path, size, Options, sLastErrorString));
+ LTOModule::createFromOpenFile(fd, path, size, Options, sLastErrorString));
}
lto_module_t lto_module_create_from_fd_at_offset(int fd, const char *path,
@@ -120,14 +120,14 @@ lto_module_t lto_module_create_from_fd_a
off_t offset) {
lto_initialize();
llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags();
- return wrap(LTOModule::makeLTOModule(fd, path, map_size, offset, Options,
- sLastErrorString));
+ return wrap(LTOModule::createFromOpenFileSlice(fd, path, map_size, offset,
+ Options, sLastErrorString));
}
lto_module_t lto_module_create_from_memory(const void* mem, size_t length) {
lto_initialize();
llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags();
- return wrap(LTOModule::makeLTOModule(mem, length, Options, sLastErrorString));
+ return wrap(LTOModule::createFromBuffer(mem, length, Options, sLastErrorString));
}
lto_module_t lto_module_create_from_memory_with_path(const void* mem,
@@ -136,7 +136,7 @@ lto_module_t lto_module_create_from_memo
lto_initialize();
llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags();
return wrap(
- LTOModule::makeLTOModule(mem, length, Options, sLastErrorString, path));
+ LTOModule::createFromBuffer(mem, length, Options, sLastErrorString, path));
}
void lto_module_dispose(lto_module_t mod) { delete unwrap(mod); }
More information about the llvm-commits
mailing list