llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-driver Author: Cameron McInally (mcinally) <details> <summary>Changes</summary> This patch moves the CommonArgs utilities into a location visible by the Frontend Drivers, so that the Frontend Drivers may share option parsing code with the Compiler Driver. This is useful when the Frontend Drivers would like to verify that their incoming options are well-formed and also not reinvent the option parsing wheel. We already see code in the Clang/Flang Drivers that is parsing and verifying its incoming options. E.g. OPT_ffp_contract. This option is parsed in the Compiler Driver, Clang Driver, and Flang Driver, all with slightly different parsing code. It would be nice if the Frontend Drivers were not required to duplicate this Compiler Driver code. That way there is no/low maintenance burden on keeping all these parsing functions in sync. Along those lines, the Frontend Drivers will now have a useful mechanism to verify their incoming options are well-formed. Currently, the Frontend Drivers trust that the Compiler Driver is not passing back junk in some cases. The Language Drivers may even accept junk with no error at all. E.g.: `clang -cc1 -mprefer-vector-width=junk test.c' With this patch, we'll now be able to tighten up incomming options to the Frontend drivers in a lightweight way. --- Patch is 33.70 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/142800.diff 56 Files Affected: - (renamed) clang/include/clang/Driver/CommonArgs.h (+6) - (modified) clang/lib/Driver/MultilibBuilder.cpp (+1-1) - (modified) clang/lib/Driver/ToolChain.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/AIX.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/AMDGPU.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/AVR.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Arch/AArch64.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Arch/LoongArch.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Arch/Mips.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Arch/PPC.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Arch/RISCV.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/BareMetal.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/CSKYToolChain.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Clang.cpp (+3-23) - (modified) clang/lib/Driver/ToolChains/CommonArgs.cpp (+28-1) - (modified) clang/lib/Driver/ToolChains/CrossWindows.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Cuda.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Cygwin.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Darwin.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/DragonFly.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Flang.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/FreeBSD.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Fuchsia.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Gnu.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/HIPAMD.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/HIPSPV.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/HIPUtility.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/HLSL.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Haiku.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Hexagon.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Hurd.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/InterfaceStubs.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Linux.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/MSP430.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/MSVC.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/MinGW.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/NaCl.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/NetBSD.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/OHOS.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/OpenBSD.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/PS4CPU.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/RISCVToolchain.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/SPIRV.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/SPIRVOpenMP.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/SYCL.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Solaris.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/UEFI.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/VEToolchain.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/WebAssembly.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/XCore.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/ZOS.cpp (+1-1) - (modified) clang/lib/Driver/XRayArgs.cpp (+1-1) - (modified) clang/unittests/Driver/MultilibBuilderTest.cpp (+1-1) - (modified) clang/unittests/Driver/MultilibTest.cpp (+1-1) - (modified) flang/lib/Frontend/CompilerInvocation.cpp (+7-13) - (modified) flang/test/Driver/prefer-vector-width.f90 (+1-1) ``````````diff diff --git a/clang/lib/Driver/ToolChains/CommonArgs.h b/clang/include/clang/Driver/CommonArgs.h similarity index 98% rename from clang/lib/Driver/ToolChains/CommonArgs.h rename to clang/include/clang/Driver/CommonArgs.h index b5b9c1e66e380..048f2eab6887e 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.h +++ b/clang/include/clang/Driver/CommonArgs.h @@ -270,6 +270,12 @@ void handleVectorizeLoopsArgs(const llvm::opt::ArgList &Args, /// Enable -fslp-vectorize based on the optimization level selected. void handleVectorizeSLPArgs(const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs); + +void ParseMPreferVectorWidthOption(clang::DiagnosticsEngine &Diags, + const llvm::opt::ArgList &Args, + llvm::opt::ArgStringList &CmdArgs, + bool isCompilerDriver); + } // end namespace tools } // end namespace driver } // end namespace clang diff --git a/clang/lib/Driver/MultilibBuilder.cpp b/clang/lib/Driver/MultilibBuilder.cpp index 8440a82f78bef..9d44d8681cf8a 100644 --- a/clang/lib/Driver/MultilibBuilder.cpp +++ b/clang/lib/Driver/MultilibBuilder.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/MultilibBuilder.h" -#include "ToolChains/CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "llvm/ADT/StringMap.h" #include "llvm/Support/Path.h" #include "llvm/Support/Regex.h" diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index ce302b308fd19..91a17b6c49fd7 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -11,13 +11,13 @@ #include "ToolChains/Arch/ARM.h" #include "ToolChains/Arch/RISCV.h" #include "ToolChains/Clang.h" -#include "ToolChains/CommonArgs.h" #include "ToolChains/Flang.h" #include "ToolChains/InterfaceStubs.h" #include "clang/Basic/ObjCRuntime.h" #include "clang/Basic/Sanitizers.h" #include "clang/Config/config.h" #include "clang/Driver/Action.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Driver.h" #include "clang/Driver/InputInfo.h" #include "clang/Driver/Job.h" diff --git a/clang/lib/Driver/ToolChains/AIX.cpp b/clang/lib/Driver/ToolChains/AIX.cpp index a1a94e37116ce..066b59305fe3f 100644 --- a/clang/lib/Driver/ToolChains/AIX.cpp +++ b/clang/lib/Driver/ToolChains/AIX.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "AIX.h" -#include "CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Options.h" #include "clang/Driver/SanitizerArgs.h" diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp index dfbe936d5a5d3..cf9c24f1e1cde 100644 --- a/clang/lib/Driver/ToolChains/AMDGPU.cpp +++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "AMDGPU.h" -#include "CommonArgs.h" #include "clang/Basic/TargetID.h" #include "clang/Config/config.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" diff --git a/clang/lib/Driver/ToolChains/AVR.cpp b/clang/lib/Driver/ToolChains/AVR.cpp index f1529f857eef8..b0523a7f4e40e 100644 --- a/clang/lib/Driver/ToolChains/AVR.cpp +++ b/clang/lib/Driver/ToolChains/AVR.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "AVR.h" -#include "CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" diff --git a/clang/lib/Driver/ToolChains/Arch/AArch64.cpp b/clang/lib/Driver/ToolChains/Arch/AArch64.cpp index eaae9f876e3ad..ea906d2e2acfc 100644 --- a/clang/lib/Driver/ToolChains/Arch/AArch64.cpp +++ b/clang/lib/Driver/ToolChains/Arch/AArch64.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "AArch64.h" -#include "../CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Options.h" #include "llvm/Option/ArgList.h" diff --git a/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp b/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp index a35f8276737ff..3318e498a74f9 100644 --- a/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp +++ b/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp @@ -8,8 +8,8 @@ #include "LoongArch.h" #include "../Clang.h" -#include "ToolChains/CommonArgs.h" #include "clang/Basic/DiagnosticDriver.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Options.h" #include "llvm/TargetParser/Host.h" diff --git a/clang/lib/Driver/ToolChains/Arch/Mips.cpp b/clang/lib/Driver/ToolChains/Arch/Mips.cpp index 0d847587e8664..8787c8276721c 100644 --- a/clang/lib/Driver/ToolChains/Arch/Mips.cpp +++ b/clang/lib/Driver/ToolChains/Arch/Mips.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "Mips.h" -#include "ToolChains/CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Options.h" #include "llvm/ADT/StringSwitch.h" diff --git a/clang/lib/Driver/ToolChains/Arch/PPC.cpp b/clang/lib/Driver/ToolChains/Arch/PPC.cpp index afa86230085ec..361a68a892a8f 100644 --- a/clang/lib/Driver/ToolChains/Arch/PPC.cpp +++ b/clang/lib/Driver/ToolChains/Arch/PPC.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "PPC.h" -#include "ToolChains/CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Options.h" #include "llvm/ADT/StringSwitch.h" diff --git a/clang/lib/Driver/ToolChains/Arch/RISCV.cpp b/clang/lib/Driver/ToolChains/Arch/RISCV.cpp index d0b620980bcef..baa2c8c0bcfb2 100644 --- a/clang/lib/Driver/ToolChains/Arch/RISCV.cpp +++ b/clang/lib/Driver/ToolChains/Arch/RISCV.cpp @@ -8,7 +8,7 @@ #include "RISCV.h" #include "../Clang.h" -#include "ToolChains/CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Options.h" #include "llvm/Option/ArgList.h" diff --git a/clang/lib/Driver/ToolChains/BareMetal.cpp b/clang/lib/Driver/ToolChains/BareMetal.cpp index 6bf2302d3bd99..d8168ed15febd 100644 --- a/clang/lib/Driver/ToolChains/BareMetal.cpp +++ b/clang/lib/Driver/ToolChains/BareMetal.cpp @@ -8,8 +8,8 @@ #include "BareMetal.h" -#include "CommonArgs.h" #include "Gnu.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/InputInfo.h" #include "Arch/ARM.h" diff --git a/clang/lib/Driver/ToolChains/CSKYToolChain.cpp b/clang/lib/Driver/ToolChains/CSKYToolChain.cpp index e944cba0eb23c..e4db3307ee3aa 100644 --- a/clang/lib/Driver/ToolChains/CSKYToolChain.cpp +++ b/clang/lib/Driver/ToolChains/CSKYToolChain.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "CSKYToolChain.h" -#include "CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 13842b8cc2870..bb3baa7cec4c0 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -14,7 +14,6 @@ #include "Arch/RISCV.h" #include "Arch/Sparc.h" #include "Arch/SystemZ.h" -#include "CommonArgs.h" #include "Hexagon.h" #include "PS4CPU.h" #include "clang/Basic/CLWarnings.h" @@ -26,6 +25,7 @@ #include "clang/Basic/Version.h" #include "clang/Config/config.h" #include "clang/Driver/Action.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Distro.h" #include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" @@ -264,27 +264,6 @@ static void ParseMRecip(const Driver &D, const ArgList &Args, OutStrings.push_back(Args.MakeArgString(Out)); } -/// The -mprefer-vector-width option accepts either a positive integer -/// or the string "none". -static void ParseMPreferVectorWidth(const Driver &D, const ArgList &Args, - ArgStringList &CmdArgs) { - Arg *A = Args.getLastArg(options::OPT_mprefer_vector_width_EQ); - if (!A) - return; - - StringRef Value = A->getValue(); - if (Value == "none") { - CmdArgs.push_back("-mprefer-vector-width=none"); - } else { - unsigned Width; - if (Value.getAsInteger(10, Width)) { - D.Diag(diag::err_drv_invalid_value) << A->getOption().getName() << Value; - return; - } - CmdArgs.push_back(Args.MakeArgString("-mprefer-vector-width=" + Value)); - } -} - static bool shouldUseExceptionTablesForObjCExceptions(const ObjCRuntime &runtime, const llvm::Triple &Triple) { @@ -7607,7 +7586,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, handleVectorizeLoopsArgs(Args, CmdArgs); handleVectorizeSLPArgs(Args, CmdArgs); - ParseMPreferVectorWidth(D, Args, CmdArgs); + ParseMPreferVectorWidthOption(D.getDiags(), Args, CmdArgs, + /*isCompilerDriver=*/true); Args.AddLastArg(CmdArgs, options::OPT_fshow_overloads_EQ); Args.AddLastArg(CmdArgs, diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index 937ee09cac7cc..d927fc6d8b54b 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "Arch/AArch64.h" #include "Arch/ARM.h" #include "Arch/CSKY.h" @@ -3167,3 +3167,30 @@ void tools::handleInterchangeLoopsArgs(const ArgList &Args, options::OPT_fno_loop_interchange, EnableInterchange)) CmdArgs.push_back("-floop-interchange"); } + +void tools::ParseMPreferVectorWidthOption(clang::DiagnosticsEngine &Diags, + const llvm::opt::ArgList &Args, + ArgStringList &CmdArgs, + bool isCompilerDriver) { + // If this was invoked by the Compiler Driver, we pass through the option + // as-is. Otherwise, if this is the Frontend Driver, we want just the value. + StringRef Out = (isCompilerDriver) ? "-mprefer-vector-width=" : ""; + + Arg *A = Args.getLastArg(clang::driver::options::OPT_mprefer_vector_width_EQ); + if (!A) + return; + + StringRef Value = A->getValue(); + unsigned Width; + + // Only "none" and Integer values are accepted by + // -mprefer-vector-width=<value>. + if (Value != "none" && Value.getAsInteger(10, Width)) { + Diags.Report(clang::diag::err_drv_invalid_value) + << A->getOption().getName() << Value; + return; + } + + CmdArgs.push_back(Args.MakeArgString(Out + Value)); + return; +} diff --git a/clang/lib/Driver/ToolChains/CrossWindows.cpp b/clang/lib/Driver/ToolChains/CrossWindows.cpp index 3c5dfba329cf8..51c892fc91718 100644 --- a/clang/lib/Driver/ToolChains/CrossWindows.cpp +++ b/clang/lib/Driver/ToolChains/CrossWindows.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "CrossWindows.h" -#include "CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Options.h" diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp index 073861dade4f7..a91e4de41c8da 100644 --- a/clang/lib/Driver/ToolChains/Cuda.cpp +++ b/clang/lib/Driver/ToolChains/Cuda.cpp @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "Cuda.h" -#include "CommonArgs.h" #include "clang/Basic/Cuda.h" #include "clang/Config/config.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Distro.h" #include "clang/Driver/Driver.h" diff --git a/clang/lib/Driver/ToolChains/Cygwin.cpp b/clang/lib/Driver/ToolChains/Cygwin.cpp index f0e90deee98b3..d9c16347daa34 100644 --- a/clang/lib/Driver/ToolChains/Cygwin.cpp +++ b/clang/lib/Driver/ToolChains/Cygwin.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "Cygwin.h" -#include "CommonArgs.h" #include "clang/Config/config.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Options.h" #include "llvm/Support/Path.h" diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index 0be7180098359..81e613cf7cdc7 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -8,10 +8,10 @@ #include "Darwin.h" #include "Arch/ARM.h" -#include "CommonArgs.h" #include "clang/Basic/AlignedAllocation.h" #include "clang/Basic/ObjCRuntime.h" #include "clang/Config/config.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Options.h" diff --git a/clang/lib/Driver/ToolChains/DragonFly.cpp b/clang/lib/Driver/ToolChains/DragonFly.cpp index 38a29ae49e8d9..524f5f2ff391e 100644 --- a/clang/lib/Driver/ToolChains/DragonFly.cpp +++ b/clang/lib/Driver/ToolChains/DragonFly.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "DragonFly.h" -#include "CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Options.h" diff --git a/clang/lib/Driver/ToolChains/Flang.cpp b/clang/lib/Driver/ToolChains/Flang.cpp index dcc46469df3e9..e0a366bfb9225 100644 --- a/clang/lib/Driver/ToolChains/Flang.cpp +++ b/clang/lib/Driver/ToolChains/Flang.cpp @@ -8,9 +8,9 @@ #include "Flang.h" #include "Arch/RISCV.h" -#include "CommonArgs.h" #include "clang/Basic/CodeGenOptions.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Options.h" #include "llvm/Frontend/Debug/Options.h" #include "llvm/Support/Path.h" diff --git a/clang/lib/Driver/ToolChains/FreeBSD.cpp b/clang/lib/Driver/ToolChains/FreeBSD.cpp index ccf6987a2ea65..b17b76233ad30 100644 --- a/clang/lib/Driver/ToolChains/FreeBSD.cpp +++ b/clang/lib/Driver/ToolChains/FreeBSD.cpp @@ -10,8 +10,8 @@ #include "Arch/ARM.h" #include "Arch/Mips.h" #include "Arch/Sparc.h" -#include "CommonArgs.h" #include "clang/Config/config.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Options.h" #include "clang/Driver/SanitizerArgs.h" diff --git a/clang/lib/Driver/ToolChains/Fuchsia.cpp b/clang/lib/Driver/ToolChains/Fuchsia.cpp index 910db1dde0d18..1c165bbfe84f5 100644 --- a/clang/lib/Driver/ToolChains/Fuchsia.cpp +++ b/clang/lib/Driver/ToolChains/Fuchsia.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "Fuchsia.h" -#include "CommonArgs.h" #include "clang/Config/config.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/MultilibBuilder.h" diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index e42cd0f97cb49..9c68c5c6de2b2 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -15,8 +15,8 @@ #include "Arch/RISCV.h" #include "Arch/Sparc.h" #include "Arch/SystemZ.h" -#include "CommonArgs.h" #include "clang/Config/config.h" // for GCC_INSTALL_PREFIX +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/MultilibBuilder.h" diff --git a/clang/lib/Driver/ToolChains/HIPAMD.cpp b/clang/lib/Driver/ToolChains/HIPAMD.cpp index fc067e9052275..a8f2b09b1b20f 100644 --- a/clang/lib/Driver/ToolChains/HIPAMD.cpp +++ b/clang/lib/Driver/ToolChains/HIPAMD.cpp @@ -8,10 +8,10 @@ #include "HIPAMD.h" #include "AMDGPU.h" -#include "CommonArgs.h" #include "HIPUtility.h" #include "SPIRV.h" #include "clang/Basic/Cuda.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/InputInfo.h" diff --git a/clang/lib/Driver/ToolChains/HIPSPV.cpp b/clang/lib/Driver/ToolChains/HIPSPV.cpp index 02ec36df273af..ec29c62976e10 100644 --- a/clang/lib/Driver/ToolChains/HIPSPV.cpp +++ b/clang/lib/Driver/ToolChains/HIPSPV.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "HIPSPV.h" -#include "CommonArgs.h" #include "HIPUtility.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/InputInfo.h" diff --git a/clang/lib/Driver/ToolChains/HIPUtility.cpp b/clang/lib/Driver/ToolChains/HIPUtility.cpp index 8a3dd494f3b4f..cb061ffede234 100644 --- a/clang/lib/Driver/ToolChains/HIPUtility.cpp +++ b/clang/lib/Driver/ToolChains/HIPUtility.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "HIPUtility.h" -#include "CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Options.h" #include "llvm/ADT/StringExtras.h" diff --git a/clang/lib/Driver/ToolChains/HLSL.cpp b/clang/lib/Driver/ToolChains/HLSL.cpp index eb8f6881bffc7..dcc51e182924c 100644 --- a/clang/lib/Driver/ToolChains/HLSL.cpp +++ b/clang/lib/Driver/ToolChains/HLSL.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "HLSL.h" -#include "CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Job.h" #include "llvm/ADT/StringSwitch.h" diff --git a/clang/lib/Driver/ToolChains/Haiku.cpp b/clang/lib/Driver/ToolChains/Haiku.cpp index 5d0d8b7f5024c..dd6ada8f56972 100644 --- a/clang/lib/Driver/ToolChains/Haiku.cpp +++ b/clang/lib/Driver/ToolChains/Haiku.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "Haiku.h" -#include "CommonArgs.h" #include "clang/Config/config.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/SanitizerArgs.h" #include "llvm/Support/Path.h" diff --git a/clang/lib/Driver/ToolChains/Hexagon.cpp b/clang/lib/Driver/ToolChains/Hexagon.cpp index bed8de94130c5..9f8b676fc7dc2 100644 --- a/clang/lib/Driver/ToolChains/Hexagon.cpp +++ b/clang/lib/Driver/ToolChains/Hexagon.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "Hexagon.h" -#include "CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/InputInfo.h" diff --git a/clang/lib/Driver/ToolChains/Hurd.cpp b/clang/lib/Driver/ToolChains/Hurd.cpp index 0bc114b90ffc0..a22a8face1797 100644 --- a/clang/lib/Driver/ToolChains/Hurd.cpp +++ b/clang/lib/Driver/ToolChains/Hurd.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "Hurd.h" -#include "CommonArgs.h" #include "clang/Config/config.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Options.h" #include "llvm/Support/Path.h" diff --git a/clang/lib/Driver/ToolChains/InterfaceStubs.cpp b/clang/lib/Driver/ToolChains/InterfaceStubs.cpp index 05a13db8d0cff..59a6742c406c2 100644 --- a/clang/lib/Driver/ToolChains/InterfaceStubs.cpp +++ b/clang/lib/Driver/ToolChains/InterfaceStubs.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "InterfaceStubs.h" -#include "CommonArgs.h" +#include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" #include "llvm/Support/Path.h" diff --git a/clang/lib/Driver/ToolChains/Linux.... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/142800 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
