awarzynski created this revision.
awarzynski added a reviewer: kiranchandramohan.
Herald added a reviewer: sscalpone.
Herald added a subscriber: sunshaoce.
Herald added projects: Flang, All.
awarzynski requested review of this revision.
Herald added subscribers: cfe-commits, jdoerfert, MaskRay.
Herald added a project: clang.
Use `AddAllArgs` to keep the implementation succinct. Also adds missing
'-flang-experimental-hlfir` in "frontend-forwarding.f90"
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D156524
Files:
clang/lib/Driver/ToolChains/Flang.cpp
flang/test/Driver/frontend-forwarding.f90
Index: flang/test/Driver/frontend-forwarding.f90
===================================================================
--- flang/test/Driver/frontend-forwarding.f90
+++ flang/test/Driver/frontend-forwarding.f90
@@ -17,6 +17,7 @@
! RUN: -fpass-plugin=Bye%pluginext \
! RUN: -fversion-loops-for-stride \
! RUN: -flang-experimental-polymorphism \
+! RUN: -flang-experimental-hlfir \
! RUN: -mllvm -print-before-all \
! RUN: -save-temps=obj \
! RUN: -P \
@@ -36,7 +37,8 @@
! CHECK: "-freciprocal-math"
! CHECK: "-fconvert=little-endian"
! CHECK: "-fpass-plugin=Bye
-! CHECK: "-flang-experimental-polymorphism"
! CHECK: "-fversion-loops-for-stride"
+! CHECK: "-flang-experimental-polymorphism"
+! CHECK: "-flang-experimental-hlfir"
! CHECK: "-mllvm" "-print-before-all"
! CHECK: "-save-temps=obj"
Index: clang/lib/Driver/ToolChains/Flang.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Flang.cpp
+++ clang/lib/Driver/ToolChains/Flang.cpp
@@ -140,12 +140,11 @@
!stackArrays->getOption().matches(options::OPT_fno_stack_arrays))
CmdArgs.push_back("-fstack-arrays");
- if (Args.hasArg(options::OPT_flang_experimental_hlfir))
- CmdArgs.push_back("-flang-experimental-hlfir");
- if (Args.hasArg(options::OPT_flang_experimental_polymorphism))
- CmdArgs.push_back("-flang-experimental-polymorphism");
if (shouldLoopVersion(Args))
CmdArgs.push_back("-fversion-loops-for-stride");
+
+ Args.AddAllArgs(CmdArgs, {options::OPT_flang_experimental_hlfir,
+ options::OPT_flang_experimental_polymorphism});
}
void Flang::addPicOptions(const ArgList &Args, ArgStringList &CmdArgs) const {
Index: flang/test/Driver/frontend-forwarding.f90
===================================================================
--- flang/test/Driver/frontend-forwarding.f90
+++ flang/test/Driver/frontend-forwarding.f90
@@ -17,6 +17,7 @@
! RUN: -fpass-plugin=Bye%pluginext \
! RUN: -fversion-loops-for-stride \
! RUN: -flang-experimental-polymorphism \
+! RUN: -flang-experimental-hlfir \
! RUN: -mllvm -print-before-all \
! RUN: -save-temps=obj \
! RUN: -P \
@@ -36,7 +37,8 @@
! CHECK: "-freciprocal-math"
! CHECK: "-fconvert=little-endian"
! CHECK: "-fpass-plugin=Bye
-! CHECK: "-flang-experimental-polymorphism"
! CHECK: "-fversion-loops-for-stride"
+! CHECK: "-flang-experimental-polymorphism"
+! CHECK: "-flang-experimental-hlfir"
! CHECK: "-mllvm" "-print-before-all"
! CHECK: "-save-temps=obj"
Index: clang/lib/Driver/ToolChains/Flang.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Flang.cpp
+++ clang/lib/Driver/ToolChains/Flang.cpp
@@ -140,12 +140,11 @@
!stackArrays->getOption().matches(options::OPT_fno_stack_arrays))
CmdArgs.push_back("-fstack-arrays");
- if (Args.hasArg(options::OPT_flang_experimental_hlfir))
- CmdArgs.push_back("-flang-experimental-hlfir");
- if (Args.hasArg(options::OPT_flang_experimental_polymorphism))
- CmdArgs.push_back("-flang-experimental-polymorphism");
if (shouldLoopVersion(Args))
CmdArgs.push_back("-fversion-loops-for-stride");
+
+ Args.AddAllArgs(CmdArgs, {options::OPT_flang_experimental_hlfir,
+ options::OPT_flang_experimental_polymorphism});
}
void Flang::addPicOptions(const ArgList &Args, ArgStringList &CmdArgs) const {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
