diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index adaad6760534e..a3c21545c3a82 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -6494,8 +6494,8 @@ Driver::getOptionVisibilityMask(bool UseDriverMode) const {
     return llvm::opt::Visibility(options::CLOption);
   if (IsDXCMode())
     return llvm::opt::Visibility(options::DXCOption);
-  if (IsFlangMode()) {
-    return llvm::opt::Visibility(options::FlangOption);
+  if (IsFlangMode())  {
+    return llvm::opt::Visibility(options::ClangOption | options::FlangOption);
   }
   return llvm::opt::Visibility(options::ClangOption);
 }