[lld] r233863 - Use llvm::make_unique.

Rui Ueyama ruiu at google.com
Wed Apr 1 15:51:47 PDT 2015


Author: ruiu
Date: Wed Apr  1 17:51:46 2015
New Revision: 233863

URL: http://llvm.org/viewvc/llvm-project?rev=233863&view=rev
Log:
Use llvm::make_unique.

Modified:
    lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp
    lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
    lld/trunk/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.cpp
    lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h
    lld/trunk/lib/ReaderWriter/ELF/ELFFile.h
    lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp
    lld/trunk/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp
    lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.cpp

Modified: lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp?rev=233863&r1=233862&r2=233863&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp Wed Apr  1 17:51:46 2015
@@ -16,8 +16,7 @@ using namespace lld;
 std::unique_ptr<ELFLinkingContext>
 elf::AArch64LinkingContext::create(llvm::Triple triple) {
   if (triple.getArch() == llvm::Triple::aarch64)
-    return std::unique_ptr<ELFLinkingContext>(
-             new elf::AArch64LinkingContext(triple));
+    return llvm::make_unique<elf::AArch64LinkingContext>(triple);
   return nullptr;
 }
 

Modified: lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h?rev=233863&r1=233862&r2=233863&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h Wed Apr  1 17:51:46 2015
@@ -36,11 +36,11 @@ public:
   }
 
   std::unique_ptr<Reader> getObjReader() override {
-    return std::unique_ptr<Reader>(new AArch64ELFObjectReader(_ctx));
+    return llvm::make_unique<AArch64ELFObjectReader>(_ctx);
   }
 
   std::unique_ptr<Reader> getDSOReader() override {
-    return std::unique_ptr<Reader>(new AArch64ELFDSOReader(_ctx));
+    return llvm::make_unique<AArch64ELFDSOReader>(_ctx);
   }
 
   std::unique_ptr<Writer> getWriter() override;

Modified: lld/trunk/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.cpp?rev=233863&r1=233862&r2=233863&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.cpp Wed Apr  1 17:51:46 2015
@@ -17,15 +17,12 @@ using namespace lld::elf;
 std::unique_ptr<ELFLinkingContext>
 elf::ARMLinkingContext::create(llvm::Triple triple) {
   if (triple.getArch() == llvm::Triple::arm)
-    return std::unique_ptr<ELFLinkingContext>(
-             new elf::ARMLinkingContext(triple));
+    return llvm::make_unique<elf::ARMLinkingContext>(triple);
   return nullptr;
 }
 
 elf::ARMLinkingContext::ARMLinkingContext(llvm::Triple triple)
-    : ELFLinkingContext(
-          triple, std::unique_ptr<TargetHandler>(new ARMTargetHandler(*this))) {
-}
+    : ELFLinkingContext(triple, llvm::make_unique<ARMTargetHandler>(*this)) {}
 
 void elf::ARMLinkingContext::addPasses(PassManager &pm) {
   auto pass = createARMRelocationPass(*this);

Modified: lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h?rev=233863&r1=233862&r2=233863&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h Wed Apr  1 17:51:46 2015
@@ -68,11 +68,11 @@ public:
   }
 
   std::unique_ptr<Reader> getObjReader() override {
-    return std::unique_ptr<Reader>(new ARMELFObjectReader(_ctx));
+    return llvm::make_unique<ARMELFObjectReader>(_ctx);
   }
 
   std::unique_ptr<Reader> getDSOReader() override {
-    return std::unique_ptr<Reader>(new ARMELFDSOReader(_ctx));
+    return llvm::make_unique<ARMELFDSOReader>(_ctx);
   }
 
   std::unique_ptr<Writer> getWriter() override;

Modified: lld/trunk/lib/ReaderWriter/ELF/ELFFile.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ELFFile.h?rev=233863&r1=233862&r2=233863&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ELFFile.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ELFFile.h Wed Apr  1 17:51:46 2015
@@ -11,7 +11,8 @@
 #define LLD_READER_WRITER_ELF_FILE_H
 
 #include "Atoms.h"
-#include <llvm/ADT/MapVector.h>
+#include "llvm/ADT/MapVector.h"
+#include "llvm/ADT/STLExtras.h"
 #include <map>
 #include <unordered_map>
 
@@ -481,8 +482,7 @@ template <class ELFT>
 ErrorOr<std::unique_ptr<ELFFile<ELFT>>>
 ELFFile<ELFT>::create(std::unique_ptr<MemoryBuffer> mb,
                       ELFLinkingContext &ctx) {
-  std::unique_ptr<ELFFile<ELFT>> file(new ELFFile<ELFT>(std::move(mb), ctx));
-  return std::move(file);
+  return llvm::make_unique<ELFFile<ELFT>>(std::move(mb), ctx);
 }
 
 template <class ELFT>

Modified: lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp?rev=233863&r1=233862&r2=233863&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp Wed Apr  1 17:51:46 2015
@@ -15,8 +15,7 @@ using namespace lld::elf;
 std::unique_ptr<lld::ELFLinkingContext>
 HexagonLinkingContext::create(llvm::Triple triple) {
   if (triple.getArch() == llvm::Triple::hexagon)
-    return std::unique_ptr<lld::ELFLinkingContext>(
-             new HexagonLinkingContext(triple));
+    return llvm::make_unique<HexagonLinkingContext>(triple);
   return nullptr;
 }
 

Modified: lld/trunk/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp?rev=233863&r1=233862&r2=233863&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp Wed Apr  1 17:51:46 2015
@@ -18,12 +18,9 @@ using namespace lld;
 std::unique_ptr<ELFLinkingContext>
 elf::X86LinkingContext::create(llvm::Triple triple) {
   if (triple.getArch() == llvm::Triple::x86)
-    return std::unique_ptr<ELFLinkingContext>(
-             new elf::X86LinkingContext(triple));
+    return llvm::make_unique<elf::X86LinkingContext>(triple);
   return nullptr;
 }
 
 elf::X86LinkingContext::X86LinkingContext(llvm::Triple triple)
-    : ELFLinkingContext(
-          triple, std::unique_ptr<TargetHandler>(new X86TargetHandler(*this))) {
-}
+    : ELFLinkingContext(triple, llvm::make_unique<X86TargetHandler>(*this)) {}

Modified: lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.cpp?rev=233863&r1=233862&r2=233863&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.cpp Wed Apr  1 17:51:46 2015
@@ -32,7 +32,6 @@ void X86_64LinkingContext::addPasses(Pas
 std::unique_ptr<ELFLinkingContext>
 X86_64LinkingContext::create(llvm::Triple triple) {
   if (triple.getArch() == llvm::Triple::x86_64)
-    return std::unique_ptr<ELFLinkingContext>(
-        new elf::X86_64LinkingContext(triple));
+    return llvm::make_unique<elf::X86_64LinkingContext>(triple);
   return nullptr;
 }





More information about the llvm-commits mailing list