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

Fix long standing issue with propagating error message back to caller. This

Browse Source 
has been a problem since exceptions were removed from the BytecodeReader.
Error messages are now captured from ModuleProvider::releaseModule as well
as after a longjmp.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32608 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2006-12-15 19:49:23 +00:00
parent cd5561a56e
commit 9b84ad14f4
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Bytecode/Reader/Reader.cpp
View File

@ -1758,8 +1758,13 @@ void BytecodeReader::ParseFunctionLazily() {
/// @see ParseBytecode /// @see ParseBytecode
bool BytecodeReader::ParseFunction(Function* Func, std::string* ErrMsg) { bool BytecodeReader::ParseFunction(Function* Func, std::string* ErrMsg) {
if (setjmp(context)) if (setjmp(context)) {
// Set caller's error message, if requested
if (ErrMsg)
*ErrMsg = ErrorMsg;
// Indicate an error occurred
return true; return true;
}
// Find {start, end} pointers and slot in the map. If not there, we're done. // Find {start, end} pointers and slot in the map. If not there, we're done.
LazyFunctionMap::iterator Fi = LazyFunctionLoadMap.find(Func); LazyFunctionMap::iterator Fi = LazyFunctionLoadMap.find(Func);
@ -1788,8 +1793,13 @@ bool BytecodeReader::ParseFunction(Function* Func, std::string* ErrMsg) {
/// to materialize the functions. /// to materialize the functions.
/// @see ParseBytecode /// @see ParseBytecode
bool BytecodeReader::ParseAllFunctionBodies(std::string* ErrMsg) { bool BytecodeReader::ParseAllFunctionBodies(std::string* ErrMsg) {
if (setjmp(context)) if (setjmp(context)) {
// Set caller's error message, if requested
if (ErrMsg)
*ErrMsg = ErrorMsg;
// Indicate an error occurred
return true; return true;
}
LazyFunctionMap::iterator Fi = LazyFunctionLoadMap.begin(); LazyFunctionMap::iterator Fi = LazyFunctionLoadMap.begin();
LazyFunctionMap::iterator Fe = LazyFunctionLoadMap.end(); LazyFunctionMap::iterator Fe = LazyFunctionLoadMap.end();

10
lib/Bytecode/Reader/ReaderWrappers.cpp
View File

@ -309,7 +309,7 @@ Module *llvm::ParseBytecodeBuffer(const unsigned char *Buffer, unsigned Length,
ModuleProvider *MP = ModuleProvider *MP =
getBytecodeBufferModuleProvider(Buffer, Length, ModuleID, ErrMsg, 0); getBytecodeBufferModuleProvider(Buffer, Length, ModuleID, ErrMsg, 0);
if (!MP) return 0; if (!MP) return 0;
Module *M = MP->releaseModule(); Module *M = MP->releaseModule(ErrMsg);
delete MP; delete MP;
return M; return M;
} }
@ -341,7 +341,7 @@ Module *llvm::ParseBytecodeFile(const std::string &Filename,
std::string *ErrMsg) { std::string *ErrMsg) {
ModuleProvider* MP = getBytecodeModuleProvider(Filename, ErrMsg); ModuleProvider* MP = getBytecodeModuleProvider(Filename, ErrMsg);
if (!MP) return 0; if (!MP) return 0;
Module *M = MP->releaseModule(); Module *M = MP->releaseModule(ErrMsg);
delete MP; delete MP;
return M; return M;
} }
@ -356,7 +356,7 @@ Module* llvm::AnalyzeBytecodeFile(
BytecodeHandler* AH = createBytecodeAnalyzerHandler(bca,output); BytecodeHandler* AH = createBytecodeAnalyzerHandler(bca,output);
ModuleProvider* MP = getBytecodeModuleProvider(Filename, ErrMsg, AH); ModuleProvider* MP = getBytecodeModuleProvider(Filename, ErrMsg, AH);
if (!MP) return 0; if (!MP) return 0;
Module *M = MP->releaseModule(); Module *M = MP->releaseModule(ErrMsg);
delete MP; delete MP;
return M; return M;
} }
@ -375,7 +375,7 @@ Module* llvm::AnalyzeBytecodeBuffer(
ModuleProvider* MP = ModuleProvider* MP =
getBytecodeBufferModuleProvider(Buffer, Length, ModuleID, ErrMsg, hdlr); getBytecodeBufferModuleProvider(Buffer, Length, ModuleID, ErrMsg, hdlr);
if (!MP) return 0; if (!MP) return 0;
Module *M = MP->releaseModule(); Module *M = MP->releaseModule(ErrMsg);
delete MP; delete MP;
return M; return M;
} }
@ -388,7 +388,7 @@ bool llvm::GetBytecodeDependentLibraries(const std::string &fname,
deplibs.clear(); deplibs.clear();
return true; return true;
} }
Module* M = MP->releaseModule(); Module* M = MP->releaseModule(ErrMsg);
deplibs = M->getLibraries(); deplibs = M->getLibraries();
delete M; delete M;
delete MP; delete MP;