[MCJIT] Remove a few more references to JITMemoryManager that survived r218316.

[oota-llvm.git] / include / llvm / ExecutionEngine / ObjectBuffer.h

diff --git a/include/llvm/ExecutionEngine/ObjectBuffer.h b/include/llvm/ExecutionEngine/ObjectBuffer.h
index a0a77b8ba888a97e46c333113b2260eeafbadfc8..ee4820aa6ee0de08ac4c89060b036193f20d751f 100644 (file)
--- a/include/llvm/ExecutionEngine/ObjectBuffer.h
+++ b/include/llvm/ExecutionEngine/ObjectBuffer.h
@@ -1,80 +1,76 @@
-//===---- ObjectBuffer.h - Utility class to wrap object image memory -----===//\r
-//\r
-//                     The LLVM Compiler Infrastructure\r
-//\r
-// This file is distributed under the University of Illinois Open Source\r
-// License. See LICENSE.TXT for details.\r
-//\r
-//===----------------------------------------------------------------------===//\r
-//\r
-// This file declares a wrapper class to hold the memory into which an\r
-// object will be generated.\r
-//\r
-//===----------------------------------------------------------------------===//\r
-\r
-#ifndef LLVM_EXECUTIONENGINE_OBJECTBUFFER_H\r
-#define LLVM_EXECUTIONENGINE_OBJECTBUFFER_H\r
-\r
-#include "llvm/ADT/SmallVector.h"\r
-#include "llvm/ADT/OwningPtr.h"\r
-#include "llvm/Support/raw_ostream.h"\r
-#include "llvm/Support/MemoryBuffer.h"\r
-\r
-namespace llvm {\r
-\r
-/// ObjectBuffer - This class acts as a container for the memory buffer used during\r
-/// generation and loading of executable objects using MCJIT and RuntimeDyld.  The\r
-/// underlying memory for the object will be owned by the ObjectBuffer instance\r
-/// throughout its lifetime.  The getMemBuffer() method provides a way to create a\r
-/// MemoryBuffer wrapper object instance to be owned by other classes (such as\r
-/// ObjectFile) as needed, but the MemoryBuffer instance returned does not own the\r
-/// actual memory it points to.\r
-class ObjectBuffer {\r
-public:\r
-  ObjectBuffer() {}\r
-  ObjectBuffer(MemoryBuffer* Buf) : Buffer(Buf) {}\r
-  virtual ~ObjectBuffer() {}\r
-\r
-  /// getMemBuffer - Like MemoryBuffer::getMemBuffer() this function\r
-  /// returns a pointer to an object that is owned by the caller. However,\r
-  /// the caller does not take ownership of the underlying memory.\r
-  MemoryBuffer *getMemBuffer() const {\r
-    return MemoryBuffer::getMemBuffer(Buffer->getBuffer(), "", false);\r
-  }\r
-\r
-  const char *getBufferStart() const { return Buffer->getBufferStart(); }\r
-  size_t getBufferSize() const { return Buffer->getBufferSize(); }\r
-\r
-protected:\r
-  // The memory contained in an ObjectBuffer\r
-  OwningPtr<MemoryBuffer> Buffer;\r
-};\r
-\r
-/// ObjectBufferStream - This class encapsulates the SmallVector and\r
-/// raw_svector_ostream needed to generate an object using MC code emission\r
-/// while providing a common ObjectBuffer interface for access to the\r
-/// memory once the object has been generated.\r
-class ObjectBufferStream : public ObjectBuffer {\r
-public:\r
-  ObjectBufferStream() : OS(SV) {}\r
-  virtual ~ObjectBufferStream() {}\r
-\r
-  raw_ostream &getOStream() { return OS; }\r
-  void flush()\r
-  {\r
-    OS.flush();\r
-\r
-    // Make the data accessible via the ObjectBuffer::Buffer\r
-    Buffer.reset(MemoryBuffer::getMemBuffer(StringRef(SV.data(), SV.size()),\r
-                                            "",\r
-                                            false));\r
-  }\r
-\r
-protected:\r
-  SmallVector<char, 4096> SV; // Working buffer into which we JIT.\r
-  raw_svector_ostream     OS; // streaming wrapper\r
-};\r
-\r
-} // namespace llvm\r
-\r
-#endif\r
+//===---- ObjectBuffer.h - Utility class to wrap object image memory -----===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file declares a wrapper class to hold the memory into which an
+// object will be generated.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_EXECUTIONENGINE_OBJECTBUFFER_H
+#define LLVM_EXECUTIONENGINE_OBJECTBUFFER_H
+
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/raw_ostream.h"
+
+namespace llvm {
+
+/// This class acts as a container for the memory buffer used during generation
+/// and loading of executable objects using MCJIT and RuntimeDyld. The
+/// underlying memory for the object will be owned by the ObjectBuffer instance
+/// throughout its lifetime.
+class ObjectBuffer {
+  virtual void anchor();
+public:
+  ObjectBuffer() {}
+  ObjectBuffer(std::unique_ptr<MemoryBuffer> Buf) : Buffer(std::move(Buf)) {}
+  virtual ~ObjectBuffer() {}
+
+  MemoryBufferRef getMemBuffer() const { return Buffer->getMemBufferRef(); }
+
+  const char *getBufferStart() const { return Buffer->getBufferStart(); }
+  size_t getBufferSize() const { return Buffer->getBufferSize(); }
+  StringRef getBuffer() const { return Buffer->getBuffer(); }
+  StringRef getBufferIdentifier() const {
+    return Buffer->getBufferIdentifier();
+  }
+
+protected:
+  // The memory contained in an ObjectBuffer
+  std::unique_ptr<MemoryBuffer> Buffer;
+};
+
+/// This class encapsulates the SmallVector and raw_svector_ostream needed to
+/// generate an object using MC code emission while providing a common
+/// ObjectBuffer interface for access to the memory once the object has been
+/// generated.
+class ObjectBufferStream : public ObjectBuffer {
+  void anchor() override;
+public:
+  ObjectBufferStream() : OS(SV) {}
+  virtual ~ObjectBufferStream() {}
+
+  raw_ostream &getOStream() { return OS; }
+  void flush()
+  {
+    OS.flush();
+
+    // Make the data accessible via the ObjectBuffer::Buffer
+    Buffer =
+        MemoryBuffer::getMemBuffer(StringRef(SV.data(), SV.size()), "", false);
+  }
+
+protected:
+  SmallVector<char, 4096> SV; // Working buffer into which we JIT.
+  raw_svector_ostream     OS; // streaming wrapper
+};
+
+} // namespace llvm
+
+#endif