Merge commit 'cb7cf626d26e' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/lib/DebugInfo/DWARF/DWARFContext.cpp

@@ -735,9 +735,9 @@ DWARFContext::DWARFContext(std::unique_ptr<const DWARFObject> DObj,
       RecoverableErrorHandler(RecoverableErrorHandler),
       WarningHandler(WarningHandler), DObj(std::move(DObj)) {
         if (ThreadSafe)
-          State.reset(new ThreadSafeState(*this, DWPName));
+          State = std::make_unique<ThreadSafeState>(*this, DWPName);
         else
-          State.reset(new ThreadUnsafeDWARFContextState(*this, DWPName));
+          State = std::make_unique<ThreadUnsafeDWARFContextState>(*this, DWPName);
       }
 
 DWARFContext::~DWARFContext() = default;