[flang][driver] Disable Clang options in Flang

banach-space · banach-space · commit b16a7581ff8b · 2023-08-21T09:27:07.000Z
Restore the desired setting that was reverted in https://reviews.llvm.org/D158289. This is to be merged once Fortran tests in llvm-test-suite are updated accordingly: https://reviews.llvm.org/D158308. Differential Revision: https://reviews.llvm.org/D158307
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
@@ -6495,7 +6495,7 @@ Driver::getOptionVisibilityMask(bool UseDriverMode) const {
   if (IsDXCMode())
     return llvm::opt::Visibility(options::DXCOption);
   if (IsFlangMode())  {
-    return llvm::opt::Visibility(options::ClangOption | options::FlangOption);
+    return llvm::opt::Visibility(options::FlangOption);
   }
   return llvm::opt::Visibility(options::ClangOption);
 }

Original file line number	Diff line number	Diff line change
`@@ -6495,7 +6495,7 @@ Driver::getOptionVisibilityMask(bool UseDriverMode) const {`
`6495`	`6495`	`if (IsDXCMode())`
`6496`	`6496`	`return llvm::opt::Visibility(options::DXCOption);`
`6497`	`6497`	`if (IsFlangMode()) {`
`6498`		`- return llvm::opt::Visibility(options::ClangOption \| options::FlangOption);`
	`6498`	`+ return llvm::opt::Visibility(options::FlangOption);`
`6499`	`6499`	`}`
`6500`	`6500`	`return llvm::opt::Visibility(options::ClangOption);`
`6501`	`6501`	`}`