6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-30 17:25:21 +00:00
Code Issues Projects Releases Wiki Activity

Don't open the file again in the gold plugin. To be able to do this, update

Browse Source 
MemoryBuffer::getOpenFile to not close the file descriptor.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@125128 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2011-02-08 22:40:47 +00:00
parent 971b83b67a
commit b4cc031a3e
8 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,7 +241,8 @@ ld_plugin_status onload(ld_plugin_tv *tv) {
/// with add_symbol if possible.
static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file,
int *claimed) {
void *buf = NULL;
lto_module_t M;
if (file->offset) {
// Gold has found what might be IR part-way inside of a file, such as
// an .a archive.
@@ -252,7 +253,7 @@ static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file,
file->offset, sys::StrError(errno).c_str());
return LDPS_ERR;
}
buf = malloc(file->filesize);
void *buf = malloc(file->filesize);
if (!buf) {
(*message)(LDPL_ERROR,
"Failed to allocate buffer for archive member of size: %d\n",
@@ -272,16 +273,31 @@ static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file,
free(buf);
return LDPS_OK;
}
} else if (!lto_module_is_object_file(file->name))
return LDPS_OK;
M = lto_module_create_from_memory(buf, file->filesize);
free(buf);
} else {
// FIXME: We should not need to pass -1 as the file size, but there
// is a bug in BFD that causes it to pass 0 to us. Remove this once
// that is fixed.
off_t size = file->filesize ? file->filesize : -1;
// FIXME: We should not need to reset the position in the file, but there
// is a bug in BFD. Remove this once that is fixed.
off_t old_pos = lseek(file->fd, 0, SEEK_CUR);
lseek(file->fd, 0, SEEK_SET);
M = lto_module_create_from_fd(file->fd, file->name, size);
lseek(file->fd, old_pos, SEEK_SET);
if (!M)
return LDPS_OK;
}
*claimed = 1;
Modules.resize(Modules.size() + 1);
claimed_file &cf = Modules.back();
cf.M = M;
cf.M = buf ? lto_module_create_from_memory(buf, file->filesize) :
lto_module_create(file->name);
free(buf);
if (!cf.M) {
(*message)(LDPL_ERROR, "Failed to create LLVM module: %s",
lto_get_error_message());