From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Wed, 27 Aug 2014 20:25:55 +0000 (+0000)
Subject: Don't create a MemoryBuffer just to get the MemoryBufferRef. NFC.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b5e9bf06ada52a18bda0ee169a0e3c368d59ecf4;p=oota-llvm.git

Don't create a MemoryBuffer just to get the MemoryBufferRef. NFC.

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

diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp
index 69d33c9a8f9..b08f74d5916 100644
--- a/tools/gold/gold-plugin.cpp
+++ b/tools/gold/gold-plugin.cpp
@@ -269,15 +269,15 @@ static const GlobalObject *getBaseObject(const GlobalValue &GV) {
 static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file,
                                         int *claimed) {
   LLVMContext Context;
-  std::unique_ptr<MemoryBuffer> buffer;
+  MemoryBufferRef BufferRef;
+  std::unique_ptr<MemoryBuffer> Buffer;
   if (get_view) {
     const void *view;
     if (get_view(file->handle, &view) != LDPS_OK) {
       message(LDPL_ERROR, "Failed to get a view of %s", file->name);
       return LDPS_ERR;
     }
-    buffer = MemoryBuffer::getMemBuffer(StringRef((char *)view, file->filesize),
-                                        "", false);
+    BufferRef = MemoryBufferRef(StringRef((char *)view, file->filesize), "");
   } else {
     int64_t offset = 0;
     // Gold has found what might be IR part-way inside of a file, such as
@@ -292,12 +292,12 @@ static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file,
       message(LDPL_ERROR, EC.message().c_str());
       return LDPS_ERR;
     }
-    buffer = std::move(BufferOrErr.get());
+    Buffer = std::move(BufferOrErr.get());
+    BufferRef = Buffer->getMemBufferRef();
   }
 
   ErrorOr<object::IRObjectFile *> ObjOrErr =
-      object::IRObjectFile::createIRObjectFile(buffer->getMemBufferRef(),
-                                               Context);
+      object::IRObjectFile::createIRObjectFile(BufferRef, Context);
   std::error_code EC = ObjOrErr.getError();
   if (EC == BitcodeError::InvalidBitcodeSignature)
     return LDPS_OK;