mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-19 11:02:59 +02:00
Implement error handling in OpenAndLoad* functions so the Linker can handle it.
llvm-svn: 18853
This commit is contained in:
parent
1e51643433
commit
466ab53f35
@ -280,13 +280,17 @@ Archive::loadArchive() {
|
||||
|
||||
// Open and completely load the archive file.
|
||||
Archive*
|
||||
Archive::OpenAndLoad(const sys::Path& file) {
|
||||
|
||||
Archive* result = new Archive(file, true);
|
||||
|
||||
result->loadArchive();
|
||||
|
||||
return result;
|
||||
Archive::OpenAndLoad(const sys::Path& file, std::string* ErrorMessage) {
|
||||
try {
|
||||
Archive* result = new Archive(file, true);
|
||||
result->loadArchive();
|
||||
return result;
|
||||
} catch (const std::string& msg) {
|
||||
if (ErrorMessage) {
|
||||
*ErrorMessage = msg;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Get all the bytecode modules from the archive
|
||||
@ -371,12 +375,17 @@ Archive::loadSymbolTable() {
|
||||
|
||||
// Open the archive and load just the symbol tables
|
||||
Archive*
|
||||
Archive::OpenAndLoadSymbols(const sys::Path& file) {
|
||||
Archive* result = new Archive(file, true);
|
||||
|
||||
result->loadSymbolTable();
|
||||
|
||||
return result;
|
||||
Archive::OpenAndLoadSymbols(const sys::Path& file, std::string* ErrorMessage) {
|
||||
try {
|
||||
Archive* result = new Archive(file, true);
|
||||
result->loadSymbolTable();
|
||||
return result;
|
||||
} catch (const std::string& msg) {
|
||||
if (ErrorMessage) {
|
||||
*ErrorMessage = msg;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Look up one symbol in the symbol table and return a ModuleProvider for the
|
||||
|
Loading…
Reference in New Issue
Block a user