From: David Blaikie Date: Tue, 2 Sep 2014 17:29:51 +0000 (+0000) Subject: Correct unique_ptr passing in MCObjectDisassembler::setFallbackRegion X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7bda61329760b44908626725e9439efd16d7ec0a;hp=251da88db88aba0393470694a1a2739f0daf3182;p=oota-llvm.git Correct unique_ptr passing in MCObjectDisassembler::setFallbackRegion Rather than passing by lvalue reference, pass by value to ensure that the caller provides an rvalue (and use move assignment, rather than release+reset, to assign to the member variable) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216916 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/MC/MCObjectDisassembler.h b/include/llvm/MC/MCObjectDisassembler.h index 5b935db5958..e1fde17dfc5 100644 --- a/include/llvm/MC/MCObjectDisassembler.h +++ b/include/llvm/MC/MCObjectDisassembler.h @@ -66,8 +66,8 @@ public: /// \brief Set the region on which to fallback if disassembly was requested /// somewhere not accessible in the object file. /// This is used for dynamic disassembly (see RawMemoryObject). - void setFallbackRegion(std::unique_ptr &Region) { - FallbackRegion.reset(Region.release()); + void setFallbackRegion(std::unique_ptr Region) { + FallbackRegion = std::move(Region); } /// \brief Set the symbolizer to use to get information on external functions.