diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2006-12-15 19:49:23 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2006-12-15 19:49:23 +0000 |
| commit | 9b84ad14f40cfec638c339b35aeb5f20ac41f35a (patch) | |
| tree | dbbe3d85571b09ccb9efaaab14279e31b34fefc0 /lib/Bytecode | |
| parent | cd5561a56e1521c7dc18744dcd371d255b580fdf (diff) | |
| download | external_llvm-9b84ad14f40cfec638c339b35aeb5f20ac41f35a.zip external_llvm-9b84ad14f40cfec638c339b35aeb5f20ac41f35a.tar.gz external_llvm-9b84ad14f40cfec638c339b35aeb5f20ac41f35a.tar.bz2 | |
Fix long standing issue with propagating error message back to caller. This
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
Diffstat (limited to 'lib/Bytecode')
| -rw-r--r-- | lib/Bytecode/Reader/Reader.cpp | 14 | ||||
| -rw-r--r-- | lib/Bytecode/Reader/ReaderWrappers.cpp | 10 |
2 files changed, 17 insertions, 7 deletions
diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp index e2ab8c1..1c747af 100644 --- a/lib/Bytecode/Reader/Reader.cpp +++ b/lib/Bytecode/Reader/Reader.cpp @@ -1758,8 +1758,13 @@ void BytecodeReader::ParseFunctionLazily() { /// @see ParseBytecode 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; + } // Find {start, end} pointers and slot in the map. If not there, we're done. LazyFunctionMap::iterator Fi = LazyFunctionLoadMap.find(Func); @@ -1788,8 +1793,13 @@ bool BytecodeReader::ParseFunction(Function* Func, std::string* ErrMsg) { /// to materialize the functions. /// @see ParseBytecode 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; + } LazyFunctionMap::iterator Fi = LazyFunctionLoadMap.begin(); LazyFunctionMap::iterator Fe = LazyFunctionLoadMap.end(); diff --git a/lib/Bytecode/Reader/ReaderWrappers.cpp b/lib/Bytecode/Reader/ReaderWrappers.cpp index d45a0f7..a69f297 100644 --- a/lib/Bytecode/Reader/ReaderWrappers.cpp +++ b/lib/Bytecode/Reader/ReaderWrappers.cpp @@ -309,7 +309,7 @@ Module *llvm::ParseBytecodeBuffer(const unsigned char *Buffer, unsigned Length, ModuleProvider *MP = getBytecodeBufferModuleProvider(Buffer, Length, ModuleID, ErrMsg, 0); if (!MP) return 0; - Module *M = MP->releaseModule(); + Module *M = MP->releaseModule(ErrMsg); delete MP; return M; } @@ -341,7 +341,7 @@ Module *llvm::ParseBytecodeFile(const std::string &Filename, std::string *ErrMsg) { ModuleProvider* MP = getBytecodeModuleProvider(Filename, ErrMsg); if (!MP) return 0; - Module *M = MP->releaseModule(); + Module *M = MP->releaseModule(ErrMsg); delete MP; return M; } @@ -356,7 +356,7 @@ Module* llvm::AnalyzeBytecodeFile( BytecodeHandler* AH = createBytecodeAnalyzerHandler(bca,output); ModuleProvider* MP = getBytecodeModuleProvider(Filename, ErrMsg, AH); if (!MP) return 0; - Module *M = MP->releaseModule(); + Module *M = MP->releaseModule(ErrMsg); delete MP; return M; } @@ -375,7 +375,7 @@ Module* llvm::AnalyzeBytecodeBuffer( ModuleProvider* MP = getBytecodeBufferModuleProvider(Buffer, Length, ModuleID, ErrMsg, hdlr); if (!MP) return 0; - Module *M = MP->releaseModule(); + Module *M = MP->releaseModule(ErrMsg); delete MP; return M; } @@ -388,7 +388,7 @@ bool llvm::GetBytecodeDependentLibraries(const std::string &fname, deplibs.clear(); return true; } - Module* M = MP->releaseModule(); + Module* M = MP->releaseModule(ErrMsg); deplibs = M->getLibraries(); delete M; delete MP; |