diff --git a/clang/lib/Analysis/UnsafeBufferUsage.cpp b/clang/lib/Analysis/UnsafeBufferUsage.cpp
index d5423d81ee3099..d941cf5fe74f50 100644
--- a/clang/lib/Analysis/UnsafeBufferUsage.cpp
+++ b/clang/lib/Analysis/UnsafeBufferUsage.cpp
@@ -196,7 +196,7 @@ class FixableGadget : public Gadget {
   /// the current strategy. Returns None if the fix cannot be produced;
   /// returns an empty list if no fixes are necessary.
   virtual Optional<FixItList> getFixits(const Strategy &) const {
-    return None;
+    return std::nullopt;
   }
 
 };