For PR797:

Adjust to new interface for MappedFile. Note that the new "throw"
statements will be removed later.

llvm-svn: 29818

1 files changed, 6 insertions, 2 deletions

diff --git a/llvm/lib/Bytecode/Archive/Archive.cpp b/llvm/lib/Bytecode/Archive/Archive.cpp
index 3bb9a055083..d5b56ca85e2 100644
--- a/llvm/lib/Bytecode/Archive/Archive.cpp
+++ b/llvm/lib/Bytecode/Archive/Archive.cpp
@@ -137,8 +137,12 @@ Archive::Archive(const sys::Path& filename, bool map )
     symTabSize(0), firstFileOffset(0), modules(), foreignST(0)
 {
   if (map) {
-    mapfile = new sys::MappedFile(filename);
-    base = (char*) mapfile->map();
+    std::string ErrMsg;
+    mapfile = new sys::MappedFile();
+    if (mapfile->open(filename, sys::MappedFile::READ_ACCESS, &ErrMsg))
+      throw ErrMsg;
+    if (!(base = (char*) mapfile->map(&ErrMsg)))
+      throw ErrMsg;
   }
 }