commit 36b56886974eae4f9c5ebc96befd3e7bfe5de338
author Stephen Hines <srhines@google.com> Wed Apr 23 16:57:46 2014 -0700
committer Stephen Hines <srhines@google.com> Thu Apr 24 15:53:16 2014 -0700
tree e6cfb69fbbd937f450eeb83bfb83b9da3b01275a
parent 69a8640022b04415ae9fac62f8ab090601d8f889

Update to LLVM 3.5a.

Change-Id: Ifadecab779f128e62e430c2b4f6ddd84953ed617

lib/MC/MCDisassembler.cpp

diff --git a/lib/MC/MCDisassembler.cpp b/lib/MC/MCDisassembler.cpp
index bfd51ab..7a2b1a1 100644
--- a/lib/MC/MCDisassembler.cpp
+++ b/lib/MC/MCDisassembler.cpp
@@ -16,21 +16,18 @@
 MCDisassembler::~MCDisassembler() {
 }
 
-void
-MCDisassembler::setupForSymbolicDisassembly(
-    LLVMOpInfoCallback GetOpInfo,
-    LLVMSymbolLookupCallback SymbolLookUp,
-    void *DisInfo,
-    MCContext *Ctx,
-    OwningPtr<MCRelocationInfo> &RelInfo) {
+void MCDisassembler::setupForSymbolicDisassembly(
+    LLVMOpInfoCallback GetOpInfo, LLVMSymbolLookupCallback SymbolLookUp,
+    void *DisInfo, MCContext *Ctx, std::unique_ptr<MCRelocationInfo> &RelInfo) {
   this->GetOpInfo = GetOpInfo;
   this->SymbolLookUp = SymbolLookUp;
   this->DisInfo = DisInfo;
   this->Ctx = Ctx;
   assert(Ctx != 0 && "No MCContext given for symbolic disassembly");
   if (!Symbolizer)
-    Symbolizer.reset(new MCExternalSymbolizer(*Ctx, RelInfo, GetOpInfo,
-                                              SymbolLookUp, DisInfo));
+    Symbolizer.reset(new MCExternalSymbolizer(*Ctx, std::move(RelInfo),
+                                              GetOpInfo, SymbolLookUp,
+                                              DisInfo));
 }
 
 bool MCDisassembler::tryAddingSymbolicOperand(MCInst &Inst, int64_t Value,
@@ -51,6 +48,6 @@
     Symbolizer->tryAddingPcLoadReferenceComment(cStream, Value, Address);
 }
 
-void MCDisassembler::setSymbolizer(OwningPtr<MCSymbolizer> &Symzer) {
-  Symbolizer.reset(Symzer.take());
+void MCDisassembler::setSymbolizer(std::unique_ptr<MCSymbolizer> Symzer) {
+  Symbolizer = std::move(Symzer);
 }