This is an archive of the discontinued LLVM Phabricator instance.

Differential D88108

[flang][driver] Fix options flang in the frontend driver
ClosedPublic

Authored by awarzynski on Sep 22 2020, 11:10 AM.

Details

Reviewers
DavidTruby
CarolineConcatto
sameeranjoshi
Commits
rG99edb9b79c46: [flang][driver] Fix options flag in the frontend driver
Summary

In the frontend driver we should be using FC1Option (frontend driver
options instead of FlangOption (flang driver options).

Diff Detail

Event Timeline

awarzynski created this revision.Sep 22 2020, 11:10 AM
Herald added a reviewer: DavidTruby. · View Herald TranscriptSep 22 2020, 11:10 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: llvm-commits. · View Herald Transcript
awarzynski requested review of this revision.Sep 22 2020, 11:10 AM
awarzynski added reviewers: CarolineConcatto, sameeranjoshi.Sep 22 2020, 11:10 AM
Harbormaster completed remote builds in B72548: Diff 293515.Sep 22 2020, 11:44 AM
CarolineConcatto accepted this revision.Sep 23 2020, 2:23 AM

Thank you @awarzynski.
I've missed that on the previous patch.

This revision is now accepted and ready to land.Sep 23 2020, 2:23 AM
sameeranjoshi accepted this revision.Sep 23 2020, 7:16 AM
This revision was landed with ongoing or failed builds.Sep 24 2020, 12:45 AM
Closed by commit rG99edb9b79c46: [flang][driver] Fix options flag in the frontend driver (authored by awarzynski). · Explain Why
This revision was automatically updated to reflect the committed changes.
awarzynski added a commit: rG99edb9b79c46: [flang][driver] Fix options flag in the frontend driver.

Revision Contents

PathSize
flang/
lib/
FrontendTool/
2 lines

Diff 293960

flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp

Show All 16 Lines
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
namespace Fortran::frontend { namespace Fortran::frontend {
bool ExecuteCompilerInvocation(CompilerInstance *flang) { bool ExecuteCompilerInvocation(CompilerInstance *flang) {
// Honor -help. // Honor -help.
if (flang->GetFrontendOpts().showHelp_) { if (flang->GetFrontendOpts().showHelp_) {
clang::driver::getDriverOptTable().PrintHelp(llvm::outs(), clang::driver::getDriverOptTable().PrintHelp(llvm::outs(),
"flang-new -fc1 [options] file...", "LLVM 'Flang' Compiler", "flang-new -fc1 [options] file...", "LLVM 'Flang' Compiler",
/*Include=*/clang::driver::options::FlangOption, /*Include=*/clang::driver::options::FC1Option,
/*Exclude=*/0, /*ShowAllAliases=*/false); /*Exclude=*/0, /*ShowAllAliases=*/false);
return true; return true;
} }
// Honor -version. // Honor -version.
if (flang->GetFrontendOpts().showVersion_) { if (flang->GetFrontendOpts().showVersion_) {
llvm::cl::PrintVersionMessage(); llvm::cl::PrintVersionMessage();
return true; return true;
} }
return true; return true;
} }
} // namespace Fortran::frontend } // namespace Fortran::frontend