For PR797:

Remove exception throwing/handling from lib/Bytecode, and adjust its users
to compensate for changes in the interface.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29875 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 4 deletions

diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index d8f2b16..be9f999 100644
--- a/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
@@ -59,11 +59,10 @@ int main(int argc, char **argv, char * const *envp) {
     // Load the bytecode...
     std::string ErrorMsg;
     ModuleProvider *MP = 0;
-    try {
-      MP = getBytecodeModuleProvider(InputFile);
-    } catch (std::string &err) {
+    MP = getBytecodeModuleProvider(InputFile, &ErrorMsg);
+    if (!MP) {
       std::cerr << "Error loading program '" << InputFile << "': "
-                << err << "\n";
+                << ErrorMsg << "\n";
       exit(1);
     }