This is an archive of the discontinued LLVM Phabricator instance.

Differential D103554

[flang][driver] Add checks for missing option arguments
ClosedPublic

Authored by awarzynski on Jun 2 2021, 1:57 PM.

Details

Reviewers
sscalpone
arnamoy10
ashermancinelli
stuartellis
SouraVX
AMDChirag
kiranchandramohan
kiranktp
tskeith
Commits
rG2b4c9bc4d489: [flang][driver] Add checks for missing option arguments
Summary

With this patch, the following invocation of the frontend driver will
return an error:

flang-new -fc1 input-file.f90 -o

Similar logic applies to other options that require arguments.

Similar checks are already available in the compiler driver, flang-new
(that's implemented in clangDriver).

Diff Detail

Event Timeline

awarzynski created this revision.Jun 2 2021, 1:57 PM
Herald added a reviewer: sscalpone. · View Herald TranscriptJun 2 2021, 1:57 PM
Herald added subscribers: usaxena95, kadircet. · View Herald Transcript
awarzynski requested review of this revision.Jun 2 2021, 1:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 2 2021, 1:57 PM
Herald added subscribers: llvm-commits, ilya-biryukov. · View Herald Transcript
awarzynski added reviewers: arnamoy10, ashermancinelli, stuartellis, SouraVX, AMDChirag, kiranchandramohan, kiranktp, tskeith.Jun 2 2021, 1:58 PM
awarzynski added a project: Restricted Project.
Herald added a subscriber: jdoerfert. · View Herald TranscriptJun 2 2021, 1:58 PM
Harbormaster completed remote builds in B107312: Diff 349369.Jun 2 2021, 2:32 PM
awarzynski added a child revision: D103177: [flang][driver] Extend the `flang` bash script to act as a driver.Jun 3 2021, 10:58 AM
ashermancinelli accepted this revision.Jun 3 2021, 8:44 PM

lgtm!

This revision is now accepted and ready to land.Jun 3 2021, 8:44 PM
Closed by commit rG2b4c9bc4d489: [flang][driver] Add checks for missing option arguments (authored by awarzynski). · Explain WhyJun 4 2021, 7:17 AM
This revision was automatically updated to reflect the committed changes.
awarzynski added a commit: rG2b4c9bc4d489: [flang][driver] Add checks for missing option arguments.
awarzynski removed a child revision: D103177: [flang][driver] Extend the `flang` bash script to act as a driver.Jun 14 2021, 8:52 AM

Revision Contents

PathSize
flang/
lib/
Frontend/
7 lines
test/
Driver/
20 lines

Diff 349369

flang/lib/Frontend/CompilerInvocation.cpp

Show First 20 Lines • Show All 489 Lines • ▼ Show 20 Linesbool CompilerInvocation::CreateFromArgs(CompilerInvocation &res,
// Parse the arguments // Parse the arguments
const llvm::opt::OptTable &opts = clang::driver::getDriverOptTable(); const llvm::opt::OptTable &opts = clang::driver::getDriverOptTable();
const unsigned includedFlagsBitmask = clang::driver::options::FC1Option; const unsigned includedFlagsBitmask = clang::driver::options::FC1Option;
unsigned missingArgIndex, missingArgCount; unsigned missingArgIndex, missingArgCount;
llvm::opt::InputArgList args = opts.ParseArgs( llvm::opt::InputArgList args = opts.ParseArgs(
commandLineArgs, missingArgIndex, missingArgCount, includedFlagsBitmask); commandLineArgs, missingArgIndex, missingArgCount, includedFlagsBitmask);
// Check for missing argument error.
if (missingArgCount) {
diags.Report(clang::diag::err_drv_missing_argument)
<< args.getArgString(missingArgIndex) << missingArgCount;
success = false;
}
// Issue errors on unknown arguments // Issue errors on unknown arguments
for (const auto *a : args.filtered(clang::driver::options::OPT_UNKNOWN)) { for (const auto *a : args.filtered(clang::driver::options::OPT_UNKNOWN)) {
auto argString = a->getAsString(args); auto argString = a->getAsString(args);
std::string nearest; std::string nearest;
if (opts.findNearest(argString, nearest, includedFlagsBitmask) > 1) if (opts.findNearest(argString, nearest, includedFlagsBitmask) > 1)
diags.Report(clang::diag::err_drv_unknown_argument) << argString; diags.Report(clang::diag::err_drv_unknown_argument) << argString;
else else
diags.Report(clang::diag::err_drv_unknown_argument_with_suggestion) diags.Report(clang::diag::err_drv_unknown_argument_with_suggestion)
▲ Show 20 Lines • Show All 138 Lines • Show Last 20 Lines

flang/test/Driver/missing-arg.f90

  • This file was added.
! Make sure that frontend driver options that require arguments are
! correctly rejected when the argument value is missing.
! REQUIRES: new-flang-driver
!-----------
! RUN lines
!-----------
! RUN: not %flang_fc1 -E %s -o 2>&1 | FileCheck %s
! RUN: not %flang_fc1 -E %s -U 2>&1 | FileCheck %s
! RUN: not %flang_fc1 -E %s -D 2>&1 | FileCheck %s
! RUN: not %flang_fc1 -E %s -I 2>&1 | FileCheck %s
! RUN: not %flang_fc1 -E %s -J 2>&1 | FileCheck %s
! RUN: not %flang_fc1 -E %s -module-dir 2>&1 | FileCheck %s
! RUN: not %flang_fc1 -E %s -fintrinsic-modules-path 2>&1 | FileCheck %s
!-----------------------
! EXPECTED OUTPUT
!-----------------------
! CHECK: error: argument to '-{{.*}}' is missing (expected 1 value)