Re-enables the new vector select in the bitcode reader, by modifying the

[oota-llvm.git] / include / llvm / Support / MemoryBuffer.h

diff --git a/include/llvm/Support/MemoryBuffer.h b/include/llvm/Support/MemoryBuffer.h
index 80672165f7f9149f42093728a21827d386cc708c..ac77f6c9a18134ec4ed4da7838703b28011f7784 100644 (file)
--- a/include/llvm/Support/MemoryBuffer.h
+++ b/include/llvm/Support/MemoryBuffer.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Chris Lattner and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -15,6 +15,7 @@
 #define LLVM_SUPPORT_MEMORYBUFFER_H
 
 #include "llvm/Support/DataTypes.h"
+#include <string>
 
 namespace llvm {
 
@@ -22,7 +23,7 @@ namespace llvm {
 /// of memory, and provides simple methods for reading files and standard input
 /// into a memory buffer.  In addition to basic access to the characters in the
 /// file, this interface guarantees you can read one character past the end of
-/// the file, and that this character will read as '\0'.
+/// @verbatim the file, and that this character will read as '\0'. @endverbatim
 class MemoryBuffer {
   const char *BufferStart; // Start of the buffer.
   const char *BufferEnd;   // End of the buffer.
@@ -39,7 +40,7 @@ public:
   
   const char *getBufferStart() const { return BufferStart; }
   const char *getBufferEnd() const   { return BufferEnd; }
-  unsigned getBufferSize() const { return BufferEnd-BufferStart; }
+  size_t getBufferSize() const { return BufferEnd-BufferStart; }
   
   /// getBufferIdentifier - Return an identifier for this buffer, typically the
   /// filename it was read from.
@@ -51,7 +52,8 @@ public:
   /// MemoryBuffer if successful, otherwise returning null.  If FileSize is
   /// specified, this means that the client knows that the file exists and that
   /// it has the specified size.
-  static MemoryBuffer *getFile(const char *FilenameStart, unsigned FnSize,
+  static MemoryBuffer *getFile(const char *Filename,
+                               std::string *ErrStr = 0,
                                int64_t FileSize = -1);
 
   /// getMemBuffer - Open the specified memory range as a MemoryBuffer.  Note
@@ -59,34 +61,47 @@ public:
   static MemoryBuffer *getMemBuffer(const char *StartPtr, const char *EndPtr,
                                     const char *BufferName = "");
   
+  /// getMemBufferCopy - Open the specified memory range as a MemoryBuffer,
+  /// copying the contents and taking ownership of it.  This has no requirements
+  /// on EndPtr[0].
+  static MemoryBuffer *getMemBufferCopy(const char *StartPtr,const char *EndPtr,
+                                        const char *BufferName = "");
+  
   /// getNewMemBuffer - Allocate a new MemoryBuffer of the specified size that
   /// is completely initialized to zeros.  Note that the caller should
   /// initialize the memory allocated by this method.  The memory is owned by
   /// the MemoryBuffer object.
-  static MemoryBuffer *getNewMemBuffer(unsigned Size,
+  static MemoryBuffer *getNewMemBuffer(size_t Size,
                                        const char *BufferName = "");
   
   /// getNewUninitMemBuffer - Allocate a new MemoryBuffer of the specified size
   /// that is not initialized.  Note that the caller should initialize the
   /// memory allocated by this method.  The memory is owned by the MemoryBuffer
   /// object.
-  static MemoryBuffer *getNewUninitMemBuffer(unsigned Size,
+  static MemoryBuffer *getNewUninitMemBuffer(size_t Size,
                                              const char *BufferName = "");
   
   /// getSTDIN - Read all of stdin into a file buffer, and return it.  This
-  /// fails if stdin is empty.
+  /// returns null if stdin is empty.
   static MemoryBuffer *getSTDIN();
   
   
   /// getFileOrSTDIN - Open the specified file as a MemoryBuffer, or open stdin
-  /// if the Filename is "-".
-  static MemoryBuffer *getFileOrSTDIN(const char *FilenameStart,unsigned FnSize,
+  /// if the Filename is "-".  If an error occurs, this returns null and fills
+  /// in *ErrStr with a reason.  If stdin is empty, this API (unlike getSTDIN)
+  /// returns an empty buffer.
+  static MemoryBuffer *getFileOrSTDIN(const char *Filename,
+                                      std::string *ErrStr = 0,
+                                      int64_t FileSize = -1);
+  
+  /// getFileOrSTDIN - Open the specified file as a MemoryBuffer, or open stdin
+  /// if the Filename is "-".  If an error occurs, this returns null and fills
+  /// in *ErrStr with a reason.
+  static MemoryBuffer *getFileOrSTDIN(const std::string &FN,
+                                      std::string *ErrStr = 0,
                                       int64_t FileSize = -1) {
-    if (FnSize == 1 && FilenameStart[0] == '-')
-      return getSTDIN();
-    return getFile(FilenameStart, FnSize, FileSize);
+    return getFileOrSTDIN(FN.c_str(), ErrStr, FileSize);
   }
-  
 };
 
 } // end namespace llvm