More changes.

Author: hokein

clang/lib/Tooling/Refactoring/AtomicChange.cpp

@@ -196,8 +196,7 @@ combineReplacementsInChanges(llvm::StringRef FilePath,
 AtomicChange::AtomicChange(const SourceManager &SM,
                            SourceLocation KeyPosition) {
   const FullSourceLoc FullKeyPosition(KeyPosition, SM);
-  FileIDAndOffset FileIDAndOffset =
-      FullKeyPosition.getSpellingLoc().getDecomposedLoc();
+  auto FileIDAndOffset = FullKeyPosition.getSpellingLoc().getDecomposedLoc();
   OptionalFileEntryRef FE = SM.getFileEntryRefForID(FileIDAndOffset.first);
   assert(FE && "Cannot create AtomicChange with invalid location.");
   FilePath = std::string(FE->getName());

clang/lib/Tooling/Refactoring/Rename/USRLocFinder.cpp

@@ -45,8 +45,7 @@ bool IsValidEditLoc(const clang::SourceManager& SM, clang::SourceLocation Loc) {
   if (Loc.isInvalid())
     return false;
   const clang::FullSourceLoc FullLoc(Loc, SM);
-  std::pair<clang::FileID, unsigned> FileIdAndOffset =
-      FullLoc.getSpellingLoc().getDecomposedLoc();
+  auto FileIdAndOffset = FullLoc.getSpellingLoc().getDecomposedLoc();
   return SM.getFileEntryForID(FileIdAndOffset.first) != nullptr;
 }