6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-15 19:24:33 +00:00
Code Issues Projects Releases Wiki Activity

LTO: rename the various makeLTOModule overloads.

Browse Source 
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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@212302 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Peter Collingbourne
2014-07-03 23:28:00 +00:00
parent ab419e6d0c
commit 1e64b30a9b
5 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/llvm/LTO/LTOModule.h
View File

@@ -86,16 +86,18 @@ public:
/// InitializeAllTargetMCs(); /// InitializeAllTargetMCs();
/// InitializeAllAsmPrinters(); /// InitializeAllAsmPrinters();
/// InitializeAllAsmParsers(); /// InitializeAllAsmParsers();
static LTOModule *makeLTOModule(const char *path, TargetOptions options, static LTOModule *createFromFile(const char *path, TargetOptions options,
std::string &errMsg); std::string &errMsg);
static LTOModule *makeLTOModule(int fd, const char *path, size_t size, static LTOModule *createFromOpenFile(int fd, const char *path, size_t size,
TargetOptions options, std::string &errMsg); TargetOptions options,
static LTOModule *makeLTOModule(int fd, const char *path, size_t map_size, std::string &errMsg);
off_t offset, TargetOptions options, static LTOModule *createFromOpenFileSlice(int fd, const char *path,
std::string &errMsg); size_t map_size, off_t offset,
static LTOModule *makeLTOModule(const void *mem, size_t length, TargetOptions options,
TargetOptions options, std::string &errMsg, std::string &errMsg);
StringRef path = ""); static LTOModule *createFromBuffer(const void *mem, size_t length,
TargetOptions options, std::string &errMsg,
StringRef path = "");
/// Return the Module's target triple. /// Return the Module's target triple.
const char *getTargetTriple() { const char *getTargetTriple() {

29
lib/LTO/LTOModule.cpp
View File

@@ -94,10 +94,8 @@ bool LTOModule::isTargetMatch(MemoryBuffer *buffer, const char *triplePrefix) {
return strncmp(Triple.c_str(), triplePrefix, strlen(triplePrefix)) == 0; return strncmp(Triple.c_str(), triplePrefix, strlen(triplePrefix)) == 0;
} }
/// makeLTOModule - Create an LTOModule. N.B. These methods take ownership of LTOModule *LTOModule::createFromFile(const char *path, TargetOptions options,
/// the buffer. std::string &errMsg) {
LTOModule *LTOModule::makeLTOModule(const char *path, TargetOptions options,
std::string &errMsg) {
std::unique_ptr<MemoryBuffer> buffer; std::unique_ptr<MemoryBuffer> buffer;
if (std::error_code ec = MemoryBuffer::getFile(path, buffer)) { if (std::error_code ec = MemoryBuffer::getFile(path, buffer)) {
errMsg = ec.message(); errMsg = ec.message();
@@ -106,17 +104,16 @@ LTOModule *LTOModule::makeLTOModule(const char *path, TargetOptions options,
return makeLTOModule(std::move(buffer), options, errMsg); return makeLTOModule(std::move(buffer), options, errMsg);
} }
LTOModule *LTOModule::makeLTOModule(int fd, const char *path, LTOModule *LTOModule::createFromOpenFile(int fd, const char *path, size_t size,
size_t size, TargetOptions options, TargetOptions options,
std::string &errMsg) { std::string &errMsg) {
return makeLTOModule(fd, path, size, 0, options, errMsg); return createFromOpenFileSlice(fd, path, size, 0, options, errMsg);
} }
LTOModule *LTOModule::makeLTOModule(int fd, const char *path, LTOModule *LTOModule::createFromOpenFileSlice(int fd, const char *path,
size_t map_size, size_t map_size, off_t offset,
off_t offset, TargetOptions options,
TargetOptions options, std::string &errMsg) {
std::string &errMsg) {
std::unique_ptr<MemoryBuffer> buffer; std::unique_ptr<MemoryBuffer> buffer;
if (std::error_code ec = if (std::error_code ec =
MemoryBuffer::getOpenFileSlice(fd, path, buffer, map_size, offset)) { MemoryBuffer::getOpenFileSlice(fd, path, buffer, map_size, offset)) {
@@ -126,9 +123,9 @@ LTOModule *LTOModule::makeLTOModule(int fd, const char *path,
return makeLTOModule(std::move(buffer), options, errMsg); return makeLTOModule(std::move(buffer), options, errMsg);
} }
LTOModule *LTOModule::makeLTOModule(const void *mem, size_t length, LTOModule *LTOModule::createFromBuffer(const void *mem, size_t length,
TargetOptions options, TargetOptions options,
std::string &errMsg, StringRef path) { std::string &errMsg, StringRef path) {
std::unique_ptr<MemoryBuffer> buffer(makeBuffer(mem, length, path)); std::unique_ptr<MemoryBuffer> buffer(makeBuffer(mem, length, path));
if (!buffer) if (!buffer)
return nullptr; return nullptr;

2
tools/gold/gold-plugin.cpp
View File

@@ -292,7 +292,7 @@ static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file,
return LDPS_OK; return LDPS_OK;
std::string Error; std::string Error;
M = LTOModule::makeLTOModule(view, file->filesize, TargetOpts, Error); M = LTOModule::createFromBuffer(view, file->filesize, TargetOpts, Error);
if (!M) { if (!M) {
(*message)(LDPL_ERROR, (*message)(LDPL_ERROR,
"LLVM gold plugin has failed to create LTO module: %s", "LLVM gold plugin has failed to create LTO module: %s",

2
tools/llvm-lto/llvm-lto.cpp
View File

@@ -110,7 +110,7 @@ int main(int argc, char **argv) {
for (unsigned i = BaseArg; i < InputFilenames.size(); ++i) { for (unsigned i = BaseArg; i < InputFilenames.size(); ++i) {
std::string error; std::string error;
std::unique_ptr<LTOModule> Module( std::unique_ptr<LTOModule> Module(
LTOModule::makeLTOModule(InputFilenames[i].c_str(), Options, error)); LTOModule::createFromFile(InputFilenames[i].c_str(), Options, error));
if (!error.empty()) { if (!error.empty()) {
errs() << argv[0] << ": error loading file '" << InputFilenames[i] errs() << argv[0] << ": error loading file '" << InputFilenames[i]
<< "': " << error << "\n"; << "': " << error << "\n";

12
tools/lto/lto.cpp
View File

@@ -104,14 +104,14 @@ lto_module_is_object_file_in_memory_for_target(const void* mem,
lto_module_t lto_module_create(const char* path) { lto_module_t lto_module_create(const char* path) {
lto_initialize(); lto_initialize();
llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags(); 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_module_t lto_module_create_from_fd(int fd, const char *path, size_t size) {
lto_initialize(); lto_initialize();
llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags(); llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags();
return wrap( 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, 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_at_offset(int fd, const char *path,
off_t offset) { off_t offset) {
lto_initialize(); lto_initialize();
llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags(); llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags();
return wrap(LTOModule::makeLTOModule(fd, path, map_size, offset, Options, return wrap(LTOModule::createFromOpenFileSlice(fd, path, map_size, offset,
sLastErrorString)); Options, sLastErrorString));
} }
lto_module_t lto_module_create_from_memory(const void* mem, size_t length) { lto_module_t lto_module_create_from_memory(const void* mem, size_t length) {
lto_initialize(); lto_initialize();
llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags(); 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, lto_module_t lto_module_create_from_memory_with_path(const void* mem,
@@ -136,7 +136,7 @@ lto_module_t lto_module_create_from_memory_with_path(const void* mem,
lto_initialize(); lto_initialize();
llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags(); llvm::TargetOptions Options = InitTargetOptionsFromCodeGenFlags();
return wrap( 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); } void lto_module_dispose(lto_module_t mod) { delete unwrap(mod); }