Author: Jan Svoboda Date: 2021-07-27T09:17:39+02:00 New Revision: 60426f33b1d417763ca1954fba5293c959c9623d
URL: https://github.com/llvm/llvm-project/commit/60426f33b1d417763ca1954fba5293c959c9623d DIFF: https://github.com/llvm/llvm-project/commit/60426f33b1d417763ca1954fba5293c959c9623d.diff LOG: [clang][driver] NFC: Move InputInfo.h from lib to include Moving `InputInfo.h` from `lib/Driver/` into `include/Driver` to be able to expose it in an API consumed from outside of `clangDriver`. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D106787 Added: clang/include/clang/Driver/InputInfo.h Modified: clang/lib/Driver/Driver.cpp clang/lib/Driver/Job.cpp clang/lib/Driver/Tool.cpp clang/lib/Driver/ToolChain.cpp clang/lib/Driver/ToolChains/AMDGPU.cpp clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp clang/lib/Driver/ToolChains/AVR.cpp clang/lib/Driver/ToolChains/AVR.h clang/lib/Driver/ToolChains/Ananas.cpp clang/lib/Driver/ToolChains/BareMetal.cpp clang/lib/Driver/ToolChains/Clang.cpp clang/lib/Driver/ToolChains/CloudABI.cpp clang/lib/Driver/ToolChains/CommonArgs.cpp clang/lib/Driver/ToolChains/CommonArgs.h clang/lib/Driver/ToolChains/Cuda.cpp clang/lib/Driver/ToolChains/HIP.cpp clang/lib/Driver/ToolChains/Hexagon.cpp clang/lib/Driver/ToolChains/MSP430.cpp clang/lib/Driver/ToolChains/MSP430.h clang/lib/Driver/ToolChains/MinGW.cpp clang/lib/Driver/ToolChains/Minix.cpp clang/lib/Driver/ToolChains/NaCl.cpp clang/lib/Driver/ToolChains/RISCVToolchain.cpp Removed: clang/lib/Driver/InputInfo.h ################################################################################ diff --git a/clang/lib/Driver/InputInfo.h b/clang/include/clang/Driver/InputInfo.h similarity index 97% rename from clang/lib/Driver/InputInfo.h rename to clang/include/clang/Driver/InputInfo.h index a6b6f7f344bc5..a1ecdb623331b 100644 --- a/clang/lib/Driver/InputInfo.h +++ b/clang/include/clang/Driver/InputInfo.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_LIB_DRIVER_INPUTINFO_H -#define LLVM_CLANG_LIB_DRIVER_INPUTINFO_H +#ifndef LLVM_CLANG_DRIVER_INPUTINFO_H +#define LLVM_CLANG_DRIVER_INPUTINFO_H #include "clang/Driver/Action.h" #include "clang/Driver/Types.h" diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 9714c3c42e840..a06eb6ccc1b3c 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -7,7 +7,6 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/Driver.h" -#include "InputInfo.h" #include "ToolChains/AIX.h" #include "ToolChains/AMDGPU.h" #include "ToolChains/AMDGPUOpenMP.h" @@ -54,6 +53,7 @@ #include "clang/Driver/Action.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Job.h" #include "clang/Driver/Options.h" #include "clang/Driver/SanitizerArgs.h" diff --git a/clang/lib/Driver/Job.cpp b/clang/lib/Driver/Job.cpp index 68d5db281c7d6..e1b62d771578c 100644 --- a/clang/lib/Driver/Job.cpp +++ b/clang/lib/Driver/Job.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/Job.h" -#include "InputInfo.h" #include "clang/Basic/LLVM.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Tool.h" #include "clang/Driver/ToolChain.h" #include "llvm/ADT/ArrayRef.h" diff --git a/clang/lib/Driver/Tool.cpp b/clang/lib/Driver/Tool.cpp index 449f69cfcb357..a198f4f3b6753 100644 --- a/clang/lib/Driver/Tool.cpp +++ b/clang/lib/Driver/Tool.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/Tool.h" -#include "InputInfo.h" +#include "clang/Driver/InputInfo.h" using namespace clang::driver; diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 63ddd2acbec15..6c1b88141c452 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -7,7 +7,6 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/ToolChain.h" -#include "InputInfo.h" #include "ToolChains/Arch/ARM.h" #include "ToolChains/Clang.h" #include "ToolChains/InterfaceStubs.h" @@ -18,6 +17,7 @@ #include "clang/Driver/Action.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Job.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 0a1da2879ee18..d63c5e12c4af4 100644 --- a/clang/lib/Driver/ToolChains/AMDGPU.cpp +++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp @@ -8,10 +8,10 @@ #include "AMDGPU.h" #include "CommonArgs.h" -#include "InputInfo.h" #include "clang/Basic/TargetID.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "llvm/Option/ArgList.h" #include "llvm/Support/Error.h" diff --git a/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp b/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp index 5915882c58dd9..fe1d19c2dd676 100644 --- a/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp +++ b/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp @@ -9,11 +9,11 @@ #include "AMDGPUOpenMP.h" #include "AMDGPU.h" #include "CommonArgs.h" -#include "InputInfo.h" #include "clang/Basic/DiagnosticDriver.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/FormatAdapters.h" diff --git a/clang/lib/Driver/ToolChains/AVR.cpp b/clang/lib/Driver/ToolChains/AVR.cpp index ea35abb86f45d..f147292038a8d 100644 --- a/clang/lib/Driver/ToolChains/AVR.cpp +++ b/clang/lib/Driver/ToolChains/AVR.cpp @@ -8,9 +8,9 @@ #include "AVR.h" #include "CommonArgs.h" -#include "InputInfo.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "llvm/ADT/Optional.h" #include "llvm/ADT/StringExtras.h" diff --git a/clang/lib/Driver/ToolChains/AVR.h b/clang/lib/Driver/ToolChains/AVR.h index 1b3b2035add2d..f612aa691182e 100644 --- a/clang/lib/Driver/ToolChains/AVR.h +++ b/clang/lib/Driver/ToolChains/AVR.h @@ -10,7 +10,7 @@ #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_AVR_H #include "Gnu.h" -#include "InputInfo.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/ToolChain.h" #include "clang/Driver/Tool.h" diff --git a/clang/lib/Driver/ToolChains/Ananas.cpp b/clang/lib/Driver/ToolChains/Ananas.cpp index e5e33fe24874e..be1476a7636c6 100644 --- a/clang/lib/Driver/ToolChains/Ananas.cpp +++ b/clang/lib/Driver/ToolChains/Ananas.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "Ananas.h" -#include "InputInfo.h" #include "CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "llvm/ADT/SmallString.h" #include "llvm/Option/ArgList.h" diff --git a/clang/lib/Driver/ToolChains/BareMetal.cpp b/clang/lib/Driver/ToolChains/BareMetal.cpp index 3d733ca504a07..ce73e39d1456d 100644 --- a/clang/lib/Driver/ToolChains/BareMetal.cpp +++ b/clang/lib/Driver/ToolChains/BareMetal.cpp @@ -9,8 +9,8 @@ #include "BareMetal.h" #include "CommonArgs.h" -#include "InputInfo.h" #include "Gnu.h" +#include "clang/Driver/InputInfo.h" #include "Arch/RISCV.h" #include "clang/Driver/Compilation.h" diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index fa45be0f8169f..ebdc63e249b61 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -20,7 +20,6 @@ #include "Arch/X86.h" #include "CommonArgs.h" #include "Hexagon.h" -#include "InputInfo.h" #include "MSP430.h" #include "PS4CPU.h" #include "clang/Basic/CharInfo.h" @@ -30,6 +29,7 @@ #include "clang/Basic/Version.h" #include "clang/Driver/Distro.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "clang/Driver/SanitizerArgs.h" #include "clang/Driver/XRayArgs.h" diff --git a/clang/lib/Driver/ToolChains/CloudABI.cpp b/clang/lib/Driver/ToolChains/CloudABI.cpp index 3efca8776260a..9ee46ac857f0f 100644 --- a/clang/lib/Driver/ToolChains/CloudABI.cpp +++ b/clang/lib/Driver/ToolChains/CloudABI.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "CloudABI.h" -#include "InputInfo.h" #include "CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "llvm/ADT/SmallString.h" #include "llvm/Option/ArgList.h" diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index cfda0ff1852c3..83cab3ac00cb6 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -17,7 +17,6 @@ #include "Arch/X86.h" #include "HIP.h" #include "Hexagon.h" -#include "InputInfo.h" #include "clang/Basic/CharInfo.h" #include "clang/Basic/LangOptions.h" #include "clang/Basic/ObjCRuntime.h" @@ -27,6 +26,7 @@ #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Job.h" #include "clang/Driver/Options.h" #include "clang/Driver/SanitizerArgs.h" diff --git a/clang/lib/Driver/ToolChains/CommonArgs.h b/clang/lib/Driver/ToolChains/CommonArgs.h index 27e15847cd45c..c94c15864661e 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.h +++ b/clang/lib/Driver/ToolChains/CommonArgs.h @@ -9,8 +9,8 @@ #ifndef LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_COMMONARGS_H #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_COMMONARGS_H -#include "InputInfo.h" #include "clang/Driver/Driver.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Multilib.h" #include "clang/Driver/Tool.h" #include "clang/Driver/ToolChain.h" diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp index 2ec5bdc967d32..769eae14df513 100644 --- a/clang/lib/Driver/ToolChains/Cuda.cpp +++ b/clang/lib/Driver/ToolChains/Cuda.cpp @@ -8,13 +8,13 @@ #include "Cuda.h" #include "CommonArgs.h" -#include "InputInfo.h" #include "clang/Basic/Cuda.h" #include "clang/Config/config.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Distro.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "llvm/ADT/Optional.h" #include "llvm/Option/ArgList.h" diff --git a/clang/lib/Driver/ToolChains/HIP.cpp b/clang/lib/Driver/ToolChains/HIP.cpp index 8c85cc755adba..59d58aadb6874 100644 --- a/clang/lib/Driver/ToolChains/HIP.cpp +++ b/clang/lib/Driver/ToolChains/HIP.cpp @@ -9,12 +9,12 @@ #include "HIP.h" #include "AMDGPU.h" #include "CommonArgs.h" -#include "InputInfo.h" #include "clang/Basic/Cuda.h" #include "clang/Basic/TargetID.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "llvm/Support/Alignment.h" #include "llvm/Support/FileSystem.h" diff --git a/clang/lib/Driver/ToolChains/Hexagon.cpp b/clang/lib/Driver/ToolChains/Hexagon.cpp index df97da5a20d6d..828bfdbb05a3c 100644 --- a/clang/lib/Driver/ToolChains/Hexagon.cpp +++ b/clang/lib/Driver/ToolChains/Hexagon.cpp @@ -8,10 +8,10 @@ #include "Hexagon.h" #include "CommonArgs.h" -#include "InputInfo.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Option/ArgList.h" diff --git a/clang/lib/Driver/ToolChains/MSP430.cpp b/clang/lib/Driver/ToolChains/MSP430.cpp index f3ed9967a81a1..96994ba77facc 100644 --- a/clang/lib/Driver/ToolChains/MSP430.cpp +++ b/clang/lib/Driver/ToolChains/MSP430.cpp @@ -9,8 +9,8 @@ #include "MSP430.h" #include "CommonArgs.h" #include "Gnu.h" -#include "InputInfo.h" #include "clang/Driver/Compilation.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Multilib.h" #include "clang/Driver/Options.h" #include "llvm/Option/ArgList.h" diff --git a/clang/lib/Driver/ToolChains/MSP430.h b/clang/lib/Driver/ToolChains/MSP430.h index 3789e7442a238..9d247ca3a896d 100644 --- a/clang/lib/Driver/ToolChains/MSP430.h +++ b/clang/lib/Driver/ToolChains/MSP430.h @@ -10,9 +10,9 @@ #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_MSP430_H #include "Gnu.h" -#include "InputInfo.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Tool.h" #include "clang/Driver/ToolChain.h" #include "llvm/ADT/StringRef.h" diff --git a/clang/lib/Driver/ToolChains/MinGW.cpp b/clang/lib/Driver/ToolChains/MinGW.cpp index 467a5479bfb74..20efbdc237a84 100644 --- a/clang/lib/Driver/ToolChains/MinGW.cpp +++ b/clang/lib/Driver/ToolChains/MinGW.cpp @@ -7,12 +7,12 @@ //===----------------------------------------------------------------------===// #include "MinGW.h" -#include "InputInfo.h" #include "CommonArgs.h" #include "clang/Config/config.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "clang/Driver/SanitizerArgs.h" #include "llvm/Option/ArgList.h" diff --git a/clang/lib/Driver/ToolChains/Minix.cpp b/clang/lib/Driver/ToolChains/Minix.cpp index 44479a24ebe78..5bceb9aba3e96 100644 --- a/clang/lib/Driver/ToolChains/Minix.cpp +++ b/clang/lib/Driver/ToolChains/Minix.cpp @@ -8,9 +8,9 @@ #include "Minix.h" #include "CommonArgs.h" -#include "InputInfo.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "llvm/Option/ArgList.h" #include "llvm/Support/VirtualFileSystem.h" diff --git a/clang/lib/Driver/ToolChains/NaCl.cpp b/clang/lib/Driver/ToolChains/NaCl.cpp index 8a150c3947532..753459cb230b7 100644 --- a/clang/lib/Driver/ToolChains/NaCl.cpp +++ b/clang/lib/Driver/ToolChains/NaCl.cpp @@ -7,11 +7,11 @@ //===----------------------------------------------------------------------===// #include "NaCl.h" -#include "InputInfo.h" #include "CommonArgs.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "llvm/Option/ArgList.h" #include "llvm/Support/Path.h" diff --git a/clang/lib/Driver/ToolChains/RISCVToolchain.cpp b/clang/lib/Driver/ToolChains/RISCVToolchain.cpp index 075c1dc11b210..714325a2db39e 100644 --- a/clang/lib/Driver/ToolChains/RISCVToolchain.cpp +++ b/clang/lib/Driver/ToolChains/RISCVToolchain.cpp @@ -8,8 +8,8 @@ #include "RISCVToolchain.h" #include "CommonArgs.h" -#include "InputInfo.h" #include "clang/Driver/Compilation.h" +#include "clang/Driver/InputInfo.h" #include "clang/Driver/Options.h" #include "llvm/Option/ArgList.h" #include "llvm/Support/FileSystem.h" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits