6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Dispose modules early and only create codegen when the plugin is being

Browse Source 
used by the linker and not by nm or ar.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126089 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2011-02-20 18:28:29 +00:00
parent eff5e69c82
commit 8e04fc3adf
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ namespace {
std::string output_name = ""; std::string output_name = "";
std::list<claimed_file> Modules; std::list<claimed_file> Modules;
std::vector<sys::Path> Cleanup; std::vector<sys::Path> Cleanup;
lto_code_gen_t code_gen; lto_code_gen_t code_gen = NULL;
} }
namespace options { namespace options {
@ -196,6 +196,8 @@ ld_plugin_status onload(ld_plugin_tv *tv) {
if ((*callback)(all_symbols_read_hook) != LDPS_OK) if ((*callback)(all_symbols_read_hook) != LDPS_OK)
return LDPS_ERR; return LDPS_ERR;
code_gen = lto_codegen_create();
} break; } break;
case LDPT_REGISTER_CLEANUP_HOOK: { case LDPT_REGISTER_CLEANUP_HOOK: {
ld_plugin_register_cleanup callback; ld_plugin_register_cleanup callback;
@ -236,8 +238,6 @@ ld_plugin_status onload(ld_plugin_tv *tv) {
return LDPS_ERR; return LDPS_ERR;
} }
code_gen = lto_codegen_create();
return LDPS_OK; return LDPS_OK;
} }
@ -322,6 +322,7 @@ static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file,
cf.syms.push_back(ld_plugin_symbol()); cf.syms.push_back(ld_plugin_symbol());
ld_plugin_symbol &sym = cf.syms.back(); ld_plugin_symbol &sym = cf.syms.back();
sym.name = const_cast<char *>(lto_module_get_symbol_name(M, i)); sym.name = const_cast<char *>(lto_module_get_symbol_name(M, i));
sym.name = strdup(sym.name);
sym.version = NULL; sym.version = NULL;
int scope = attrs & LTO_SYMBOL_SCOPE_MASK; int scope = attrs & LTO_SYMBOL_SCOPE_MASK;
@ -379,7 +380,11 @@ static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file,
} }
} }
lto_codegen_add_module(code_gen, M); if (code_gen)
lto_codegen_add_module(code_gen, M);
lto_module_dispose(M);
return LDPS_OK; return LDPS_OK;
} }
@ -389,6 +394,8 @@ static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file,
/// codegen. /// codegen.
static ld_plugin_status all_symbols_read_hook(void) { static ld_plugin_status all_symbols_read_hook(void) {
std::ofstream api_file; std::ofstream api_file;
assert(code_gen);
if (options::generate_api_file) { if (options::generate_api_file) {
api_file.open("apifile.txt", std::ofstream::out | std::ofstream::trunc); api_file.open("apifile.txt", std::ofstream::out | std::ofstream::trunc);
if (!api_file.is_open()) { if (!api_file.is_open()) {
@ -469,10 +476,10 @@ static ld_plugin_status all_symbols_read_hook(void) {
std::string ErrMsg; std::string ErrMsg;
const char *objPath; const char *objPath;
sys::Path uniqueObjPath("/tmp/llvmgold.o");
if (!options::obj_path.empty()) { if (!options::obj_path.empty()) {
objPath = options::obj_path.c_str(); objPath = options::obj_path.c_str();
} else { } else {
sys::Path uniqueObjPath("/tmp/llvmgold.o");
if (uniqueObjPath.createTemporaryFileOnDisk(true, &ErrMsg)) { if (uniqueObjPath.createTemporaryFileOnDisk(true, &ErrMsg)) {
(*message)(LDPL_ERROR, "%s", ErrMsg.c_str()); (*message)(LDPL_ERROR, "%s", ErrMsg.c_str());
return LDPS_ERR; return LDPS_ERR;
@ -497,6 +504,13 @@ static ld_plugin_status all_symbols_read_hook(void) {
objFile.keep(); objFile.keep();
lto_codegen_dispose(code_gen); lto_codegen_dispose(code_gen);
for (std::list<claimed_file>::iterator I = Modules.begin(),
E = Modules.end(); I != E; ++I) {
for (unsigned i = 0; i != I->syms.size(); ++i) {
ld_plugin_symbol &sym = I->syms[i];
free(sym.name);
}
}
if ((*add_input_file)(objPath) != LDPS_OK) { if ((*add_input_file)(objPath) != LDPS_OK) {
(*message)(LDPL_ERROR, "Unable to add .o file to the link."); (*message)(LDPL_ERROR, "Unable to add .o file to the link.");