Index: include/llvm/DebugInfo/PDB/IPDBSession.h
===================================================================
--- include/llvm/DebugInfo/PDB/IPDBSession.h
+++ include/llvm/DebugInfo/PDB/IPDBSession.h
@@ -36,7 +36,7 @@
     if (!Symbol)
       return nullptr;
 
-    T *ConcreteSymbol = dyn_cast<T>(Symbol.get());
+    T *ConcreteSymbol = dyn_cast<T>(Symbol);
     if (!ConcreteSymbol)
       return nullptr;
     Symbol.release();
Index: lib/DebugInfo/PDB/PDBContext.cpp
===================================================================
--- lib/DebugInfo/PDB/PDBContext.cpp
+++ lib/DebugInfo/PDB/PDBContext.cpp
@@ -38,9 +38,9 @@
   uint32_t Length = 1;
   std::unique_ptr<PDBSymbol> Symbol =
       Session->findSymbolByAddress(Address, PDB_SymType::None);
-  if (auto Func = dyn_cast_or_null<PDBSymbolFunc>(Symbol.get())) {
+  if (auto *Func = dyn_cast_or_null<PDBSymbolFunc>(Symbol)) {
     Length = Func->getLength();
-  } else if (auto Data = dyn_cast_or_null<PDBSymbolData>(Symbol.get())) {
+  } else if (auto *Data = dyn_cast_or_null<PDBSymbolData>(Symbol)) {
     Length = Data->getLength();
   }
 
@@ -101,7 +101,7 @@
     // PDBSymbolPublicSymbol.
     auto PublicSym =
         Session->findSymbolByAddress(Address, PDB_SymType::PublicSymbol);
-    if (auto PS = dyn_cast_or_null<PDBSymbolPublicSymbol>(PublicSym.get()))
+    if (auto *PS = dyn_cast_or_null<PDBSymbolPublicSymbol>(PublicSym))
       return PS->getName();
   }
 
@@ -113,8 +113,8 @@
   // although they technically requested the linkage name, if the linkage
   // name is not available we fallback to at least returning a non-empty
   // string.
-  if (auto Func = dyn_cast_or_null<PDBSymbolFunc>(FuncSymbol.get()))
-      return Func->getName();
+  if (auto *Func = dyn_cast_or_null<PDBSymbolFunc>(FuncSymbol))
+    return Func->getName();
 
   return std::string();
 }
Index: lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
===================================================================
--- lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
+++ lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
@@ -194,7 +194,7 @@
   // probably using PEs and PDBs, and we shouldn't do the override. PE files
   // generally only contain the names of exported symbols.
   return FNKind == FunctionNameKind::LinkageName && UseSymbolTable &&
-         isa<DWARFContext>(DebugInfoContext.get());
+         isa<DWARFContext>(DebugInfoContext);
 }
 
 DILineInfo SymbolizableObjectFile::symbolizeCode(uint64_t ModuleOffset,
Index: lib/Object/ELFYAML.cpp
===================================================================
--- lib/Object/ELFYAML.cpp
+++ lib/Object/ELFYAML.cpp
@@ -713,33 +713,33 @@
   case ELF::SHT_RELA:
     if (!IO.outputting())
       Section.reset(new ELFYAML::RelocationSection());
-    sectionMapping(IO, *cast<ELFYAML::RelocationSection>(Section.get()));
+    sectionMapping(IO, cast<ELFYAML::RelocationSection>(*Section));
     break;
   case ELF::SHT_GROUP:
     if (!IO.outputting())
       Section.reset(new ELFYAML::Group());
-    groupSectionMapping(IO, *cast<ELFYAML::Group>(Section.get()));
+    groupSectionMapping(IO, cast<ELFYAML::Group>(*Section));
     break;
   case ELF::SHT_NOBITS:
     if (!IO.outputting())
       Section.reset(new ELFYAML::NoBitsSection());
-    sectionMapping(IO, *cast<ELFYAML::NoBitsSection>(Section.get()));
+    sectionMapping(IO, cast<ELFYAML::NoBitsSection>(*Section));
     break;
   case ELF::SHT_MIPS_ABIFLAGS:
     if (!IO.outputting())
       Section.reset(new ELFYAML::MipsABIFlags());
-    sectionMapping(IO, *cast<ELFYAML::MipsABIFlags>(Section.get()));
+    sectionMapping(IO, cast<ELFYAML::MipsABIFlags>(*Section));
     break;
   default:
     if (!IO.outputting())
       Section.reset(new ELFYAML::RawContentSection());
-    sectionMapping(IO, *cast<ELFYAML::RawContentSection>(Section.get()));
+    sectionMapping(IO, cast<ELFYAML::RawContentSection>(*Section));
   }
 }
 
 StringRef MappingTraits<std::unique_ptr<ELFYAML::Section>>::validate(
     IO &io, std::unique_ptr<ELFYAML::Section> &Section) {
-  const auto *RawSection = dyn_cast<ELFYAML::RawContentSection>(Section.get());
+  const auto *RawSection = dyn_cast<ELFYAML::RawContentSection>(Section);
   if (!RawSection || RawSection->Size >= RawSection->Content.binary_size())
     return StringRef();
   return "Section size must be greater or equal to the content size";
Index: lib/ProfileData/CoverageMappingReader.cpp
===================================================================
--- lib/ProfileData/CoverageMappingReader.cpp
+++ lib/ProfileData/CoverageMappingReader.cpp
@@ -445,14 +445,14 @@
     return EC;
   auto Bin = std::move(BinOrErr.get());
   std::unique_ptr<ObjectFile> OF;
-  if (auto *Universal = dyn_cast<object::MachOUniversalBinary>(Bin.get())) {
+  if (auto *Universal = dyn_cast<object::MachOUniversalBinary>(Bin)) {
     // If we have a universal binary, try to look up the object for the
     // appropriate architecture.
     auto ObjectFileOrErr = Universal->getObjectForArch(Arch);
     if (std::error_code EC = ObjectFileOrErr.getError())
       return EC;
     OF = std::move(ObjectFileOrErr.get());
-  } else if (isa<object::ObjectFile>(Bin.get())) {
+  } else if (isa<object::ObjectFile>(Bin)) {
     // For any other object file, upcast and take ownership.
     OF.reset(cast<object::ObjectFile>(Bin.release()));
     // If we've asked for a particular arch, make sure they match.
Index: lib/Support/YAMLTraits.cpp
===================================================================
--- lib/Support/YAMLTraits.cpp
+++ lib/Support/YAMLTraits.cpp
@@ -276,7 +276,7 @@
   if (SequenceHNode *SQ = dyn_cast<SequenceHNode>(CurrentNode)) {
     unsigned Index = 0;
     for (auto &N : SQ->Entries) {
-      if (ScalarHNode *SN = dyn_cast<ScalarHNode>(N.get())) {
+      if (ScalarHNode *SN = dyn_cast<ScalarHNode>(N)) {
         if (SN->value().equals(Str)) {
           BitValuesUsed[Index] = true;
           return true;
Index: tools/dsymutil/BinaryHolder.cpp
===================================================================
--- tools/dsymutil/BinaryHolder.cpp
+++ tools/dsymutil/BinaryHolder.cpp
@@ -174,7 +174,7 @@
 ErrorOr<const object::ObjectFile &>
 BinaryHolder::getObjfileForArch(const Triple &T) {
   for (const auto &Obj : CurrentObjectFiles) {
-    if (const auto *MachO = dyn_cast<object::MachOObjectFile>(Obj.get())) {
+    if (const auto *MachO = dyn_cast<object::MachOObjectFile>(Obj)) {
       if (getTriple(*MachO).str() == T.str())
         return *MachO;
     } else if (Obj->getArch() == T.getArch())
Index: tools/llvm-pdbdump/ClassDefinitionDumper.cpp
===================================================================
--- tools/llvm-pdbdump/ClassDefinitionDumper.cpp
+++ tools/llvm-pdbdump/ClassDefinitionDumper.cpp
@@ -83,7 +83,7 @@
 
     auto &AccessGroup = Groups.find((int)Access)->second;
 
-    if (auto Func = dyn_cast<PDBSymbolFunc>(Child.get())) {
+    if (auto *Func = dyn_cast<PDBSymbolFunc>(Child)) {
       if (Func->isCompilerGenerated() && opts::ExcludeCompilerGenerated)
         continue;
       if (Func->getLength() == 0 && !Func->isPureVirtual() &&
@@ -91,7 +91,7 @@
         continue;
       Child.release();
       AccessGroup.Functions.push_back(std::unique_ptr<PDBSymbolFunc>(Func));
-    } else if (auto Data = dyn_cast<PDBSymbolData>(Child.get())) {
+    } else if (auto *Data = dyn_cast<PDBSymbolData>(Child)) {
       Child.release();
       AccessGroup.Data.push_back(std::unique_ptr<PDBSymbolData>(Data));
     } else {
Index: tools/llvm-pdbdump/FunctionDumper.cpp
===================================================================
--- tools/llvm-pdbdump/FunctionDumper.cpp
+++ tools/llvm-pdbdump/FunctionDumper.cpp
@@ -234,7 +234,7 @@
   if (!PointeeType)
     return;
 
-  if (auto FuncSig = dyn_cast<PDBSymbolTypeFunctionSig>(PointeeType.get())) {
+  if (auto *FuncSig = dyn_cast<PDBSymbolTypeFunctionSig>(PointeeType)) {
     FunctionDumper NestedDumper(Printer);
     PointerType Pointer =
         Symbol.isReference() ? PointerType::Reference : PointerType::Pointer;
Index: tools/llvm-pdbdump/TypedefDumper.cpp
===================================================================
--- tools/llvm-pdbdump/TypedefDumper.cpp
+++ tools/llvm-pdbdump/TypedefDumper.cpp
@@ -56,7 +56,7 @@
   auto PointeeType = Symbol.getSession().getSymbolById(PointeeId);
   if (!PointeeType)
     return;
-  if (auto FuncSig = dyn_cast<PDBSymbolTypeFunctionSig>(PointeeType.get())) {
+  if (auto *FuncSig = dyn_cast<PDBSymbolTypeFunctionSig>(PointeeType)) {
     FunctionDumper::PointerType Pointer = FunctionDumper::PointerType::Pointer;
     if (Symbol.isReference())
       Pointer = FunctionDumper::PointerType::Reference;
Index: tools/llvm-pdbdump/VariableDumper.cpp
===================================================================
--- tools/llvm-pdbdump/VariableDumper.cpp
+++ tools/llvm-pdbdump/VariableDumper.cpp
@@ -100,7 +100,7 @@
   if (!PointeeType)
     return;
 
-  if (auto Func = dyn_cast<PDBSymbolFunc>(PointeeType.get())) {
+  if (auto *Func = dyn_cast<PDBSymbolFunc>(PointeeType)) {
     FunctionDumper NestedDumper(Printer);
     FunctionDumper::PointerType Pointer =
         Symbol.isReference() ? FunctionDumper::PointerType::Reference
@@ -131,7 +131,7 @@
     std::string IndexSpec;
     raw_string_ostream IndexStream(IndexSpec);
     std::unique_ptr<PDBSymbol> ElementType = ArrayType->getElementType();
-    while (auto NestedArray = dyn_cast<PDBSymbolTypeArray>(ElementType.get())) {
+    while (auto *NestedArray = dyn_cast<PDBSymbolTypeArray>(ElementType)) {
       IndexStream << "[";
       IndexStream << NestedArray->getCount();
       IndexStream << "]";
@@ -155,8 +155,7 @@
   // signature carries no name, so we have to handle this case separately.
   if (auto *PointerType = dyn_cast<PDBSymbolTypePointer>(&Type)) {
     auto PointeeType = PointerType->getPointeeType();
-    if (auto *FunctionSig =
-            dyn_cast<PDBSymbolTypeFunctionSig>(PointeeType.get())) {
+    if (auto *FunctionSig = dyn_cast<PDBSymbolTypeFunctionSig>(PointeeType)) {
       FunctionDumper Dumper(Printer);
       FunctionDumper::PointerType PT = FunctionDumper::PointerType::Pointer;
       if (PointerType->isReference())