1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/llvm-project/clang/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp b/contrib/llvm-project/clang/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp
index a69b76a3c971..7708fea53d01 100644
--- a/contrib/llvm-project/clang/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp
+++ b/contrib/llvm-project/clang/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp
@@ -145,14 +145,12 @@ private:
   void handleVarTemplateDecl(const VarTemplateDecl *VTD) {
     USRSet.insert(getUSRForDecl(VTD));
     USRSet.insert(getUSRForDecl(VTD->getTemplatedDecl()));
-    llvm::for_each(VTD->specializations(), [&](const auto *Spec) {
+    for (const auto *Spec : VTD->specializations())
       USRSet.insert(getUSRForDecl(Spec));
-    });
     SmallVector<VarTemplatePartialSpecializationDecl *, 4> PartialSpecs;
     VTD->getPartialSpecializations(PartialSpecs);
-    llvm::for_each(PartialSpecs, [&](const auto *Spec) {
+    for (const auto *Spec : PartialSpecs)
       USRSet.insert(getUSRForDecl(Spec));
-    });
   }
 
   void addUSRsOfCtorDtors(const CXXRecordDecl *RD) {
@@ -245,7 +243,8 @@ private:
           DiagnosticsEngine::Error,
           "SourceLocation in file %0 at offset %1 is invalid");
       Engine.Report(SourceLocation(), InvalidOffset)
-          << SourceMgr.getFileEntryForID(MainFileID)->getName() << SymbolOffset;
+          << SourceMgr.getFileEntryRefForID(MainFileID)->getName()
+          << SymbolOffset;
       return false;
     }