MemoryBuffer API update.

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

diff --git a/lib/Basic/FileManager.cpp b/lib/Basic/FileManager.cpp
index 22a63decb9f34b283ce2705f526cdeb4953259eb..488d4c3b8dfeb489a4f8f928d70291907f8d3059 100644 (file)
--- a/lib/Basic/FileManager.cpp
+++ b/lib/Basic/FileManager.cpp
@@ -401,55 +401,54 @@ void FileManager::FixupRelativePath(llvm::sys::Path &path,
 
 llvm::MemoryBuffer *FileManager::
 getBufferForFile(const FileEntry *Entry, std::string *ErrorStr) {
+  llvm::OwningPtr<llvm::MemoryBuffer> Result;
   llvm::error_code ec;
   if (FileSystemOpts.WorkingDir.empty()) {
     const char *Filename = Entry->getName();
     // If the file is already open, use the open file descriptor.
     if (Entry->FD != -1) {
-      llvm::MemoryBuffer *Buf =
-        llvm::MemoryBuffer::getOpenFile(Entry->FD, Filename, ec,
-                                        Entry->getSize());
-      if (Buf == 0 && ErrorStr)
+      ec = llvm::MemoryBuffer::getOpenFile(Entry->FD, Filename, Result,
+                                           Entry->getSize());
+      if (ErrorStr)
         *ErrorStr = ec.message();
       // getOpenFile will have closed the file descriptor, don't reuse or
       // reclose it.
       Entry->FD = -1;
-      return Buf;
+      return Result.take();
     }
 
     // Otherwise, open the file.
-    llvm::MemoryBuffer *res =
-      llvm::MemoryBuffer::getFile(Filename, ec, Entry->getSize());
-    if (res == 0 && ErrorStr)
+    ec = llvm::MemoryBuffer::getFile(Filename, Result, Entry->getSize());
+    if (ec && ErrorStr)
       *ErrorStr = ec.message();
-    return res;
+    return Result.take();
   }
   
   llvm::sys::Path FilePath(Entry->getName());
   FixupRelativePath(FilePath, FileSystemOpts);
-  llvm::MemoryBuffer *res =
-    llvm::MemoryBuffer::getFile(FilePath.c_str(), ec, Entry->getSize());
-  if (res == 0 && ErrorStr)
+  ec = llvm::MemoryBuffer::getFile(FilePath.c_str(), Result, Entry->getSize());
+  if (ec && ErrorStr)
     *ErrorStr = ec.message();
-  return res;
+  return Result.take();
 }
 
 llvm::MemoryBuffer *FileManager::
 getBufferForFile(llvm::StringRef Filename, std::string *ErrorStr) {
+  llvm::OwningPtr<llvm::MemoryBuffer> Result;
   llvm::error_code ec;
   if (FileSystemOpts.WorkingDir.empty()) {
-    llvm::MemoryBuffer *res = llvm::MemoryBuffer::getFile(Filename, ec);
-    if (res == 0 && ErrorStr)
+    ec = llvm::MemoryBuffer::getFile(Filename, Result);
+    if (ec && ErrorStr)
       *ErrorStr = ec.message();
-    return res;
+    return Result.take();
   }
 
   llvm::sys::Path FilePath(Filename);
   FixupRelativePath(FilePath, FileSystemOpts);
-  llvm::MemoryBuffer *res = llvm::MemoryBuffer::getFile(FilePath.c_str(), ec);
-  if (res == 0 && ErrorStr)
+  ec = llvm::MemoryBuffer::getFile(FilePath.c_str(), Result);
+  if (ec && ErrorStr)
     *ErrorStr = ec.message();
-  return res;
+  return Result.take();
 }
 
 /// getStatValue - Get the 'stat' information for the specified path, using the

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 9af6263319ed7df662e1df96ace3bb1b93b859bc..e292c8fbba5a309a3577c193e919c80c40824f08 100644 (file)
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -1244,11 +1244,9 @@ static bool HasMultilib(llvm::Triple::ArchType Arch, enum LinuxDistro Distro) {
 }
 
 static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
-  llvm::error_code ec;
-  llvm::OwningPtr<const llvm::MemoryBuffer>
-    LsbRelease(llvm::MemoryBuffer::getFile("/etc/lsb-release", ec));
-  if (LsbRelease) {
-    llvm::StringRef Data = LsbRelease.get()->getBuffer();
+  llvm::OwningPtr<llvm::MemoryBuffer> File;
+  if (!llvm::MemoryBuffer::getFile("/etc/lsb-release", File)) {
+    llvm::StringRef Data = File.get()->getBuffer();
     llvm::SmallVector<llvm::StringRef, 8> Lines;
     Data.split(Lines, "\n");
     for (unsigned int i = 0, s = Lines.size(); i < s; ++ i) {
@@ -1257,17 +1255,15 @@ static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
       else if (Lines[i] == "DISTRIB_CODENAME=lucid")
         return UbuntuLucid;
       else if (Lines[i] == "DISTRIB_CODENAME=jaunty")
-       return UbuntuJaunty;
+        return UbuntuJaunty;
       else if (Lines[i] == "DISTRIB_CODENAME=karmic")
         return UbuntuKarmic;
     }
     return UnknownDistro;
   }
 
-  llvm::OwningPtr<const llvm::MemoryBuffer>
-    RHRelease(llvm::MemoryBuffer::getFile("/etc/redhat-release", ec));
-  if (RHRelease) {
-    llvm::StringRef Data = RHRelease.get()->getBuffer();
+  if (!llvm::MemoryBuffer::getFile("/etc/redhat-release", File)) {
+    llvm::StringRef Data = File.get()->getBuffer();
     if (Data.startswith("Fedora release 14 (Laughlin)"))
       return Fedora14;
     else if (Data.startswith("Fedora release 13 (Goddard)"))
@@ -1275,10 +1271,8 @@ static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
     return UnknownDistro;
   }
 
-  llvm::OwningPtr<const llvm::MemoryBuffer>
-    DebianVersion(llvm::MemoryBuffer::getFile("/etc/debian_version", ec));
-  if (DebianVersion) {
-    llvm::StringRef Data = DebianVersion.get()->getBuffer();
+  if (!llvm::MemoryBuffer::getFile("/etc/debian_version", File)) {
+    llvm::StringRef Data = File.get()->getBuffer();
     if (Data[0] == '5')
       return DebianLenny;
     else if (Data.startswith("squeeze/sid"))
@@ -1286,10 +1280,8 @@ static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
     return UnknownDistro;
   }
 
-  llvm::OwningPtr<const llvm::MemoryBuffer>
-    SuseRelease(llvm::MemoryBuffer::getFile("/etc/SuSE-release", ec));
-  if (SuseRelease) {
-    llvm::StringRef Data = SuseRelease.get()->getBuffer();
+  if (!llvm::MemoryBuffer::getFile("/etc/SuSE-release", File)) {
+    llvm::StringRef Data = File.get()->getBuffer();
     if (Data.startswith("openSUSE 11.3"))
       return OpenSuse11_3;
     return UnknownDistro;

diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp
index d1e1e69184cb18584d574669befd3bdc8474362b..d97e8c77277b0cc020aeadd7773cbf1d6e4024d1 100644 (file)
--- a/lib/Frontend/CompilerInstance.cpp
+++ b/lib/Frontend/CompilerInstance.cpp
@@ -487,9 +487,8 @@ bool CompilerInstance::InitializeSourceManager(llvm::StringRef InputFile,
     }
     SourceMgr.createMainFileID(File);
   } else {
-    llvm::error_code ec;
-    llvm::MemoryBuffer *SB = llvm::MemoryBuffer::getSTDIN(ec);
-    if (!SB) {
+    llvm::OwningPtr<llvm::MemoryBuffer> SB;
+    if (llvm::MemoryBuffer::getSTDIN(SB)) {
       // FIXME: Give ec.message() in this diag.
       Diags.Report(diag::err_fe_error_reading_stdin);
       return false;
@@ -497,7 +496,7 @@ bool CompilerInstance::InitializeSourceManager(llvm::StringRef InputFile,
     const FileEntry *File = FileMgr.getVirtualFile(SB->getBufferIdentifier(),
                                                    SB->getBufferSize(), 0);
     SourceMgr.createMainFileID(File);
-    SourceMgr.overrideFileContents(File, SB);
+    SourceMgr.overrideFileContents(File, SB.take());
   }
 
   assert(!SourceMgr.getMainFileID().isInvalid() &&

diff --git a/lib/Lex/PTHLexer.cpp b/lib/Lex/PTHLexer.cpp
index aeec3fcc257057525b9f19c63181eac04e2de75b..975753bc23bceb2cbd6e8d3bf5b859f0d8f80c40 100644 (file)
--- a/lib/Lex/PTHLexer.cpp
+++ b/lib/Lex/PTHLexer.cpp
@@ -437,11 +437,9 @@ static void InvalidPTH(Diagnostic &Diags, const char *Msg) {
 
 PTHManager *PTHManager::Create(const std::string &file, Diagnostic &Diags) {
   // Memory map the PTH file.
-  llvm::error_code ec;
-  llvm::OwningPtr<llvm::MemoryBuffer> File(
-    llvm::MemoryBuffer::getFile(file, ec));
+  llvm::OwningPtr<llvm::MemoryBuffer> File;
 
-  if (!File) {
+  if (llvm::MemoryBuffer::getFile(file, File)) {
     // FIXME: Add ec.message() to this diag.
     Diags.Report(diag::err_invalid_pth_file) << file;
     return 0;

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index bbabf80486ea0918214ac168e84a33aa479994c0..a4ba4967742a1e7e4159959c4d7b33ac01738eb7 100644 (file)
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -2278,7 +2278,7 @@ ASTReader::ASTReadResult ASTReader::ReadASTCore(llvm::StringRef FileName,
   std::string ErrStr;
   llvm::error_code ec;
   if (FileName == "-") {
-    F.Buffer.reset(llvm::MemoryBuffer::getSTDIN(ec));
+    ec = llvm::MemoryBuffer::getSTDIN(F.Buffer);
     if (ec)
       ErrStr = ec.message();
   } else

diff --git a/tools/driver/cc1as_main.cpp b/tools/driver/cc1as_main.cpp
index ec2332c92269c906f58aac81fd24ba455fae38d7..2eb9ff96f1d2fb684cca2cb77ce2353bbf5851c8 100644 (file)
--- a/tools/driver/cc1as_main.cpp
+++ b/tools/driver/cc1as_main.cpp
@@ -228,13 +228,13 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, Diagnostic &Diags) {
     return false;
   }
 
-  error_code ec;
-  MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(Opts.InputFile, ec);
-  if (Buffer == 0) {
+  OwningPtr<MemoryBuffer> BufferPtr;
+  if (error_code ec = MemoryBuffer::getFileOrSTDIN(Opts.InputFile, BufferPtr)) {
     Error = ec.message();
     Diags.Report(diag::err_fe_error_reading) << Opts.InputFile;
     return false;
   }
+  MemoryBuffer *Buffer = BufferPtr.take();
 
   SourceMgr SrcMgr;
 

diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index 1e0aaf6258cac8093e94bf2613970b8f8368c4ae..d210a4018a3ce7dda47efc96b503c66659df3047 100644 (file)
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -182,9 +182,8 @@ static void ExpandArgsFromBuf(const char *Arg,
                               llvm::SmallVectorImpl<const char*> &ArgVector,
                               std::set<std::string> &SavedStrings) {
   const char *FName = Arg + 1;
-  llvm::error_code ec;
-  llvm::MemoryBuffer *MemBuf = llvm::MemoryBuffer::getFile(FName, ec);
-  if (!MemBuf) {
+  llvm::OwningPtr<llvm::MemoryBuffer> MemBuf;
+  if (llvm::MemoryBuffer::getFile(FName, MemBuf)) {
     ArgVector.push_back(SaveStringInSet(SavedStrings, Arg));
     return;
   }
@@ -235,7 +234,6 @@ static void ExpandArgsFromBuf(const char *Arg,
     }
     CurArg.push_back(*P);
   }
-  delete MemBuf;
 }
 
 static void ExpandArgv(int argc, const char **argv,