Skip to content

[flang][driver] Use -Xflang in diagnostics #164741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 29, 2025
Merged

[flang][driver] Use -Xflang in diagnostics #164741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
997c041
[flang][driver] Use -Xflang in diagnostics
Oct 23, 2025
dca0583
Improve clarity of comment
Oct 23, 2025
e7d7243
Fix clang-format error
Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,18 @@ InputArgList Driver::ParseArgStrings(ArrayRef<const char *> ArgStrings,
auto ArgString = A->getAsString(Args);
std::string Nearest;
if (getOpts().findNearest(ArgString, Nearest, VisibilityMask) > 1) {
if (!IsCLMode() &&
getOpts().findExact(ArgString, Nearest,
llvm::opt::Visibility(options::CC1Option))) {
if (IsFlangMode()) {
if (getOpts().findExact(ArgString, Nearest,
llvm::opt::Visibility(options::FC1Option))) {
DiagID = diag::err_drv_unknown_argument_with_suggestion;
Diags.Report(DiagID) << ArgString << "-Xflang " + Nearest;
} else {
DiagID = diag::err_drv_unknown_argument;
Diags.Report(DiagID) << ArgString;
}
} else if (!IsCLMode() && getOpts().findExact(ArgString, Nearest,
llvm::opt::Visibility(
options::CC1Option))) {
DiagID = diag::err_drv_unknown_argument_with_suggestion;
Diags.Report(DiagID) << ArgString << "-Xclang " + Nearest;
} else {
Expand Down
21 changes: 19 additions & 2 deletions flang/test/Driver/flang-f-opts.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
! Test for warnings generated when parsing driver options. You can use this file for relatively small tests and to avoid creating
! new test files.
! Test for errors and warnings generated when parsing driver options. You can
! use this file for relatively small tests and to avoid creating new test files.

! RUN: %flang -### -S -O4 -ffp-contract=on %s 2>&1 | FileCheck %s

Expand All @@ -26,3 +26,20 @@
! RUN: | FileCheck %s -check-prefix=WARN-BUILTIN-MULTIPLE
! WARN-BUILTIN-MULTIPLE: warning: '-fbuiltin' is not valid for Fortran
! WARN-BUILTIN-MULTIPLE: warning: '-fno-builtin' is not valid for Fortran

! When emitting an error with a suggestion, ensure that the diagnostic message
! uses '-Xflang' instead of '-Xclang'. This is typically emitted when an option
! that is available for `flang -fc1` is passed to `flang`. We use -complex-range
! since it is only available for fc1. If this option is ever exposed to `flang`,
! a different option will have to be used in the test below.
!
! RUN: not %flang -### -complex-range=full %s 2>&1 \
! RUN: | FileCheck %s -check-prefix UNKNOWN-SUGGEST
!
! UNKNOWN-SUGGEST: error: unknown argument '-complex-range=full';
! UNKNOWN-SUGGEST-SAME: did you mean '-Xflang -complex-range=full'
!
! RUN: not %flang -### -not-an-option %s 2>&1 \
! RUN: | FileCheck %s -check-prefix UNKNOWN-NO-SUGGEST
!
! UNKNOWN-NO-SUGGEST: error: unknown argument: '-not-an-option'{{$}}