commit b152fd247c16d7401f406db42cbb35cd649cdb4b
author Reid Spencer <rspencer@reidspencer.com> Tue Aug 22 16:10:12 2006 +0000
committer Reid Spencer <rspencer@reidspencer.com> Tue Aug 22 16:10:12 2006 +0000
tree 03b07c6bd708d23079a70f8700a450f4a4479789
parent 233fe721c5489a32b8b5aaf4e6b43e4383d75400

For PR797:
Adjust the use of MappedFile to its new non-throwing interface. We just
propagate the exceptions if an error occurs. This will get cleaned up
later, incrementally.


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

lib/Bytecode/Reader/ReaderWrappers.cpp

diff --git a/lib/Bytecode/Reader/ReaderWrappers.cpp b/lib/Bytecode/Reader/ReaderWrappers.cpp
index b9e7cd2..1767159 100644
--- a/lib/Bytecode/Reader/ReaderWrappers.cpp
+++ b/lib/Bytecode/Reader/ReaderWrappers.cpp
@@ -48,11 +48,17 @@
 BytecodeFileReader::BytecodeFileReader(const std::string &Filename,
                                        llvm::BytecodeHandler* H )
   : BytecodeReader(H)
-  , mapFile( sys::Path(Filename))
+  , mapFile()
 {
-  mapFile.map();
+  std::string ErrMsg;
+  if (mapFile.open(sys::Path(Filename), sys::MappedFile::READ_ACCESS, &ErrMsg))
+    throw ErrMsg;
+  if (!mapFile.map(&ErrMsg))
+    throw ErrMsg;
   unsigned char* buffer = reinterpret_cast<unsigned char*>(mapFile.base());
-  ParseBytecode(buffer, mapFile.size(), Filename);
+  if (ParseBytecode(buffer, mapFile.size(), Filename, &ErrMsg)) {
+    throw ErrMsg;
+  }
 }
 
 //===----------------------------------------------------------------------===//
@@ -98,11 +104,10 @@
     ParseBegin = Buffer = Buf;
     MustDelete = false;
   }
-  try {
-    ParseBytecode(ParseBegin, Length, ModuleID);
-  } catch (...) {
+  std::string ErrMsg;
+  if (ParseBytecode(ParseBegin, Length, ModuleID, &ErrMsg)) {
     if (MustDelete) delete [] Buffer;
-    throw;
+    throw ErrMsg;
   }
 }
 
@@ -149,7 +154,10 @@
     throw std::string("Standard Input empty!");
 
   FileBuf = &FileData[0];
-  ParseBytecode(FileBuf, FileData.size(), "<stdin>");
+  std::string ErrMsg;
+  if (ParseBytecode(FileBuf, FileData.size(), "<stdin>", &ErrMsg)) {
+    throw ErrMsg;
+  }
 }
 
 //===----------------------------------------------------------------------===//