diff --git a/clang-tools-extra/clang-tidy/bugprone/ReservedIdentifierCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/ReservedIdentifierCheck.cpp
index 90c1f7ecdc0ec2..71c7daaf7c1eea 100644
--- a/clang-tools-extra/clang-tidy/bugprone/ReservedIdentifierCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/ReservedIdentifierCheck.cpp
@@ -130,9 +130,9 @@ getFailureInfoImpl(StringRef Name, bool IsInGlobalNamespace,
       }
     };
     auto InProgressFixup = [&] {
-      return Info
-          .transform(
-              [](const FailureInfo &Info) { return StringRef(Info.Fixup); })
+      return llvm::transformOptional(
+                 Info,
+                 [](const FailureInfo &Info) { return StringRef(Info.Fixup); })
           .value_or(Name);
     };
     if (auto Fixup = getDoubleUnderscoreFixup(InProgressFixup(), LangOpts))