[flang-commits] [clang] [clang-tools-extra] [flang] [lld] [lldb] [llvm] [NFC] Rename Option parsing related files from OptXYZ -> OptionXYZ (PR #110692)
via flang-commits
flang-commits at lists.llvm.org
Tue Oct 1 12:07:14 PDT 2024
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-lld
@llvm/pr-subscribers-clang
Author: Rahul Joshi (jurahul)
<details>
<summary>Changes</summary>
Rename option parsing related files from OptXYZ -> OptionXYZ, since Opt could be confused with optimization and Opt as a short hand for Option is not really that smaller to warrant its use.
---
Patch is 53.29 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/110692.diff
90 Files Affected:
- (modified) clang-tools-extra/modularize/Modularize.cpp (+1-1)
- (modified) clang-tools-extra/pp-trace/PPTrace.cpp (+1-1)
- (modified) clang/docs/InternalsManual.rst (+1-1)
- (modified) clang/include/clang/Driver/OptionUtils.h (+1-1)
- (modified) clang/include/clang/Driver/Options.h (+1-1)
- (modified) clang/include/clang/Driver/Options.td (+1-1)
- (modified) clang/lib/Driver/Compilation.cpp (+1-1)
- (modified) clang/lib/Driver/Driver.cpp (+2-2)
- (modified) clang/lib/Driver/DriverOptions.cpp (+1-1)
- (modified) clang/lib/Driver/ToolChain.cpp (+1-1)
- (modified) clang/lib/Frontend/CompilerInvocation.cpp (+2-2)
- (modified) clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp (+1-1)
- (modified) clang/lib/Tooling/InterpolatingCompilationDatabase.cpp (+1-1)
- (modified) clang/lib/Tooling/Tooling.cpp (+1-1)
- (modified) clang/tools/clang-check/ClangCheck.cpp (+1-1)
- (modified) clang/tools/clang-installapi/InstallAPIOpts.td (+1-1)
- (modified) clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp (+1-1)
- (modified) clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td (+1-1)
- (modified) clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp (+1-1)
- (modified) clang/tools/clang-nvlink-wrapper/NVLinkOpts.td (+1-1)
- (modified) clang/tools/clang-scan-deps/Opts.td (+1-1)
- (modified) clang/tools/driver/cc1_main.cpp (+1-1)
- (modified) clang/tools/driver/cc1as_main.cpp (+1-1)
- (modified) clang/tools/driver/driver.cpp (+1-1)
- (modified) flang/lib/Frontend/CompilerInvocation.cpp (+1-1)
- (modified) flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp (+1-1)
- (modified) flang/tools/flang-driver/fc1_main.cpp (+1-1)
- (modified) lld/COFF/Options.td (+1-1)
- (modified) lld/ELF/Options.td (+1-1)
- (modified) lld/MachO/Driver.h (+1-1)
- (modified) lld/MachO/Options.td (+1-1)
- (modified) lld/MinGW/Options.td (+1-1)
- (modified) lld/wasm/Options.td (+1-1)
- (modified) lldb/tools/driver/Options.td (+1-1)
- (modified) lldb/tools/lldb-dap/Options.td (+1-1)
- (modified) lldb/tools/lldb-dap/lldb-dap.cpp (+1-1)
- (modified) lldb/tools/lldb-server/LLGSOptions.td (+1-1)
- (modified) lldb/tools/lldb-server/lldb-gdbserver.cpp (+1-1)
- (modified) llvm/include/llvm/Option/ArgList.h (+2-2)
- (modified) llvm/include/llvm/Option/Option.h (+2-2)
- (renamed) llvm/include/llvm/Option/OptionParser.td (+4-4)
- (renamed) llvm/include/llvm/Option/OptionSpecifier.h (+4-4)
- (renamed) llvm/include/llvm/Option/OptionTable.h (+8-9)
- (modified) llvm/lib/ExecutionEngine/JITLink/COFFOptions.td (+1-1)
- (modified) llvm/lib/Option/ArgList.cpp (+3-3)
- (modified) llvm/lib/Option/CMakeLists.txt (+1-1)
- (modified) llvm/lib/Option/Option.cpp (+1-1)
- (renamed) llvm/lib/Option/OptionTable.cpp (+34-31)
- (modified) llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp (+1-1)
- (modified) llvm/lib/ToolDrivers/llvm-dlltool/Options.td (+1-1)
- (modified) llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp (+1-1)
- (modified) llvm/lib/ToolDrivers/llvm-lib/Options.td (+1-1)
- (modified) llvm/tools/dsymutil/Options.td (+1-1)
- (modified) llvm/tools/llvm-cgdata/Opts.td (+1-1)
- (modified) llvm/tools/llvm-cvtres/Opts.td (+1-1)
- (modified) llvm/tools/llvm-cxxfilt/Opts.td (+1-1)
- (modified) llvm/tools/llvm-debuginfod-find/Opts.td (+1-1)
- (modified) llvm/tools/llvm-debuginfod/Opts.td (+1-1)
- (modified) llvm/tools/llvm-dwarfutil/Options.td (+1-1)
- (modified) llvm/tools/llvm-dwp/Opts.td (+1-1)
- (modified) llvm/tools/llvm-gsymutil/Opts.td (+1-1)
- (modified) llvm/tools/llvm-ifs/Opts.td (+1-1)
- (modified) llvm/tools/llvm-libtool-darwin/Opts.td (+1-1)
- (modified) llvm/tools/llvm-lipo/LipoOpts.td (+1-1)
- (modified) llvm/tools/llvm-ml/Opts.td (+1-1)
- (modified) llvm/tools/llvm-mt/Opts.td (+1-1)
- (modified) llvm/tools/llvm-nm/Opts.td (+1-1)
- (modified) llvm/tools/llvm-objcopy/BitcodeStripOpts.td (+1-1)
- (modified) llvm/tools/llvm-objcopy/CommonOpts.td (+1-1)
- (modified) llvm/tools/llvm-objcopy/InstallNameToolOpts.td (+1-1)
- (modified) llvm/tools/llvm-objdump/ObjdumpOptID.h (+1-1)
- (modified) llvm/tools/llvm-objdump/ObjdumpOpts.td (+1-1)
- (modified) llvm/tools/llvm-objdump/OtoolOpts.td (+1-1)
- (modified) llvm/tools/llvm-rc/Opts.td (+1-1)
- (modified) llvm/tools/llvm-rc/WindresOpts.td (+1-1)
- (modified) llvm/tools/llvm-rc/llvm-rc.cpp (+1-1)
- (modified) llvm/tools/llvm-readobj/Opts.td (+1-1)
- (modified) llvm/tools/llvm-readtapi/TapiOpts.td (+1-1)
- (modified) llvm/tools/llvm-size/Opts.td (+1-1)
- (modified) llvm/tools/llvm-strings/Opts.td (+1-1)
- (modified) llvm/tools/llvm-symbolizer/Opts.td (+1-1)
- (modified) llvm/tools/llvm-tli-checker/Opts.td (+1-1)
- (modified) llvm/tools/sancov/Opts.td (+1-1)
- (modified) llvm/unittests/Option/OptionParsingTest.cpp (+1-1)
- (modified) llvm/unittests/Option/Opts.td (+1-1)
- (modified) llvm/utils/TableGen/Common/CMakeLists.txt (+1-1)
- (renamed) llvm/utils/TableGen/Common/OptionEmitter.cpp (+2-2)
- (renamed) llvm/utils/TableGen/Common/OptionEmitter.h (+4-4)
- (modified) llvm/utils/TableGen/OptionParserEmitter.cpp (+1-1)
- (modified) llvm/utils/TableGen/OptionRSTEmitter.cpp (+1-1)
``````````diff
diff --git a/clang-tools-extra/modularize/Modularize.cpp b/clang-tools-extra/modularize/Modularize.cpp
index 4bb3bae0503acd..7c3f82fcf749b7 100644
--- a/clang-tools-extra/modularize/Modularize.cpp
+++ b/clang-tools-extra/modularize/Modularize.cpp
@@ -240,8 +240,8 @@
#include "clang/Tooling/Tooling.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MemoryBuffer.h"
diff --git a/clang-tools-extra/pp-trace/PPTrace.cpp b/clang-tools-extra/pp-trace/PPTrace.cpp
index 0b078c49a55b7a..cd1e9ab8f604e4 100644
--- a/clang-tools-extra/pp-trace/PPTrace.cpp
+++ b/clang-tools-extra/pp-trace/PPTrace.cpp
@@ -37,8 +37,8 @@
#include "clang/Tooling/Tooling.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/GlobPattern.h"
diff --git a/clang/docs/InternalsManual.rst b/clang/docs/InternalsManual.rst
index b70ec35f3da229..acdd55acb50c81 100644
--- a/clang/docs/InternalsManual.rst
+++ b/clang/docs/InternalsManual.rst
@@ -672,7 +672,7 @@ variable for the option value:
Next, declare the command line interface of the option in the tablegen file
``clang/include/clang/Driver/Options.td``. This is done by instantiating the
-``Option`` class (defined in ``llvm/include/llvm/Option/OptParser.td``). The
+``Option`` class (defined in ``llvm/include/llvm/Option/OptionParser.td``). The
instance is typically created through one of the helper classes that encode the
acceptable ways to specify the option value on the command line:
diff --git a/clang/include/clang/Driver/OptionUtils.h b/clang/include/clang/Driver/OptionUtils.h
index 922f536bf33eac..67c3e81a0d4c9d 100644
--- a/clang/include/clang/Driver/OptionUtils.h
+++ b/clang/include/clang/Driver/OptionUtils.h
@@ -15,7 +15,7 @@
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/LLVM.h"
-#include "llvm/Option/OptSpecifier.h"
+#include "llvm/Option/OptionSpecifier.h"
namespace llvm {
diff --git a/clang/include/clang/Driver/Options.h b/clang/include/clang/Driver/Options.h
index 0797410e9940e2..b9e7f01d0e3ce8 100644
--- a/clang/include/clang/Driver/Options.h
+++ b/clang/include/clang/Driver/Options.h
@@ -9,8 +9,8 @@
#ifndef LLVM_CLANG_DRIVER_OPTIONS_H
#define LLVM_CLANG_DRIVER_OPTIONS_H
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
namespace clang {
namespace driver {
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
index 9d183ff2d69b3c..b55ff03d9919e3 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//
// Include the common option parsing interfaces.
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// When generating documentation, we expect there to be a GlobalDocumentation
// def containing the program name that we are generating documentation for.
diff --git a/clang/lib/Driver/Compilation.cpp b/clang/lib/Driver/Compilation.cpp
index ad077d5bbfa69a..e7f658e6b47c10 100644
--- a/clang/lib/Driver/Compilation.cpp
+++ b/clang/lib/Driver/Compilation.cpp
@@ -18,8 +18,8 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptSpecifier.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionSpecifier.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/TargetParser/Triple.h"
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index fba6a8853c3960..ee21306d35063d 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -75,9 +75,9 @@
#include "llvm/MC/TargetRegistry.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptSpecifier.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionSpecifier.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/ExitCodes.h"
diff --git a/clang/lib/Driver/DriverOptions.cpp b/clang/lib/Driver/DriverOptions.cpp
index b25801a8f3f494..9248861833f420 100644
--- a/clang/lib/Driver/DriverOptions.cpp
+++ b/clang/lib/Driver/DriverOptions.cpp
@@ -8,8 +8,8 @@
#include "clang/Driver/Options.h"
#include "llvm/ADT/STLExtras.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include <cassert>
using namespace clang::driver;
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 16f9b629fc538c..235e8c236004f3 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -35,8 +35,8 @@
#include "llvm/MC/TargetRegistry.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/FileUtilities.h"
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index a0291ccfea2458..0c74576ec6ffb5 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -63,9 +63,9 @@
#include "llvm/MC/MCTargetOptions.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptSpecifier.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionSpecifier.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/ProfileData/InstrProfReader.h"
#include "llvm/Remarks/HotnessThresholdParser.h"
#include "llvm/Support/CodeGen.h"
diff --git a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
index 7476b1076d1038..69c8eb994089a5 100644
--- a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
@@ -26,8 +26,8 @@
#include "clang/Rewrite/Frontend/FrontendActions.h"
#include "clang/StaticAnalyzer/Frontend/AnalyzerHelpFlags.h"
#include "clang/StaticAnalyzer/Frontend/FrontendActions.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/BuryPointer.h"
#include "llvm/Support/DynamicLibrary.h"
#include "llvm/Support/ErrorHandling.h"
diff --git a/clang/lib/Tooling/InterpolatingCompilationDatabase.cpp b/clang/lib/Tooling/InterpolatingCompilationDatabase.cpp
index 995019ca5a4d49..124116dc2b53d4 100644
--- a/clang/lib/Tooling/InterpolatingCompilationDatabase.cpp
+++ b/clang/lib/Tooling/InterpolatingCompilationDatabase.cpp
@@ -51,7 +51,7 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/StringSaver.h"
diff --git a/clang/lib/Tooling/Tooling.cpp b/clang/lib/Tooling/Tooling.cpp
index ffacf9cf1f7829..581f123253fb4e 100644
--- a/clang/lib/Tooling/Tooling.cpp
+++ b/clang/lib/Tooling/Tooling.cpp
@@ -40,8 +40,8 @@
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/Twine.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
diff --git a/clang/tools/clang-check/ClangCheck.cpp b/clang/tools/clang-check/ClangCheck.cpp
index fa6dd06a1ee58e..0fae93039acfc0 100644
--- a/clang/tools/clang-check/ClangCheck.cpp
+++ b/clang/tools/clang-check/ClangCheck.cpp
@@ -29,7 +29,7 @@
#include "clang/Tooling/Syntax/Tree.h"
#include "clang/Tooling/Tooling.h"
#include "llvm/ADT/STLExtras.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/TargetSelect.h"
diff --git a/clang/tools/clang-installapi/InstallAPIOpts.td b/clang/tools/clang-installapi/InstallAPIOpts.td
index fc0fbe929c8878..045999fd00517b 100644
--- a/clang/tools/clang-installapi/InstallAPIOpts.td
+++ b/clang/tools/clang-installapi/InstallAPIOpts.td
@@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//
// Include the common option parsing interfaces.
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
/////////
diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
index 9fea1fdcd5fb46..6b7d9aabe2e420 100644
--- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
+++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
@@ -36,8 +36,8 @@
#include "llvm/Object/ObjectFile.h"
#include "llvm/Object/OffloadBinary.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Passes/PassPlugin.h"
#include "llvm/Remarks/HotnessThresholdParser.h"
#include "llvm/Support/CommandLine.h"
diff --git a/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td b/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td
index a3e8199380046f..ac228a90c3b25a 100644
--- a/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td
+++ b/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
def WrapperOnlyOption : OptionFlag;
def DeviceOnlyOption : OptionFlag;
diff --git a/clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp b/clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp
index b4b376fe0d114e..8f811182df6cbe 100644
--- a/clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp
+++ b/clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp
@@ -30,8 +30,8 @@
#include "llvm/Object/ObjectFile.h"
#include "llvm/Object/OffloadBinary.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Remarks/HotnessThresholdParser.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileOutputBuffer.h"
diff --git a/clang/tools/clang-nvlink-wrapper/NVLinkOpts.td b/clang/tools/clang-nvlink-wrapper/NVLinkOpts.td
index eeb9d1a6228240..4ba015fa0db46b 100644
--- a/clang/tools/clang-nvlink-wrapper/NVLinkOpts.td
+++ b/clang/tools/clang-nvlink-wrapper/NVLinkOpts.td
@@ -1,7 +1,7 @@
// We try to create options similar to lld's. That way, options passed to clang
// -Xoffload-linker can be the same whether offloading to nvptx or amdgpu.
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
def WrapperOnlyOption : OptionFlag;
diff --git a/clang/tools/clang-scan-deps/Opts.td b/clang/tools/clang-scan-deps/Opts.td
index 4837ce6f070d73..d26f8436cb117d 100644
--- a/clang/tools/clang-scan-deps/Opts.td
+++ b/clang/tools/clang-scan-deps/Opts.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name, string help> : Flag<["-"], name>, HelpText<help>;
class Arg<string name, string help> : Separate<["-"], name>, HelpText<help>;
diff --git a/clang/tools/driver/cc1_main.cpp b/clang/tools/driver/cc1_main.cpp
index 554dc956c7cfe3..e658d939b33a74 100644
--- a/clang/tools/driver/cc1_main.cpp
+++ b/clang/tools/driver/cc1_main.cpp
@@ -34,7 +34,7 @@
#include "llvm/MC/TargetRegistry.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/BuryPointer.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/ErrorHandling.h"
diff --git a/clang/tools/driver/cc1as_main.cpp b/clang/tools/driver/cc1as_main.cpp
index 7fe97cc6e6ace1..644ad60ba865fb 100644
--- a/clang/tools/driver/cc1as_main.cpp
+++ b/clang/tools/driver/cc1as_main.cpp
@@ -39,7 +39,7 @@
#include "llvm/MC/TargetRegistry.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FileSystem.h"
diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp
index 686eaea0aa7c83..36f4c3b0752718 100644
--- a/clang/tools/driver/driver.cpp
+++ b/clang/tools/driver/driver.cpp
@@ -31,8 +31,8 @@
#include "llvm/ADT/StringSet.h"
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/BuryPointer.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/CrashRecoveryContext.h"
diff --git a/flang/lib/Frontend/CompilerInvocation.cpp b/flang/lib/Frontend/CompilerInvocation.cpp
index 2154b9ab2fbf47..f0926fcd09dbf4 100644
--- a/flang/lib/Frontend/CompilerInvocation.cpp
+++ b/flang/lib/Frontend/CompilerInvocation.cpp
@@ -31,7 +31,7 @@
#include "llvm/Frontend/Debug/Options.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/CodeGen.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/FileUtilities.h"
diff --git a/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
index e2cbd5112d6ea5..4d217e004c6381 100644
--- a/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ b/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
@@ -24,8 +24,8 @@
#include "mlir/Pass/PassManager.h"
#include "clang/Basic/DiagnosticFrontend.h"
#include "clang/Driver/Options.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/BuryPointer.h"
#include "llvm/Support/CommandLine.h"
diff --git a/flang/tools/flang-driver/fc1_main.cpp b/flang/tools/flang-driver/fc1_main.cpp
index b5b062aaac2671..74889506440d6f 100644
--- a/flang/tools/flang-driver/fc1_main.cpp
+++ b/flang/tools/flang-driver/fc1_main.cpp
@@ -23,7 +23,7 @@
#include "clang/Driver/DriverDiagnostic.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/TargetSelect.h"
#include <cstdio>
diff --git a/lld/COFF/Options.td b/lld/COFF/Options.td
index 7ceb824c068de3..3979213cfc3bd2 100644
--- a/lld/COFF/Options.td
+++ b/lld/COFF/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// link.exe accepts options starting with either a dash or a slash.
diff --git a/lld/ELF/Options.td b/lld/ELF/Options.td
index c80c4017d3512c..4c47c16b7a2f0e 100644
--- a/lld/ELF/Options.td
+++ b/lld/ELF/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// Convenience classes for long options which only accept two dashes. For lld
// specific or newer long options, we prefer two dashes to avoid collision with
diff --git a/lld/MachO/Driver.h b/lld/MachO/Driver.h
index 82cd1880ecab1b..17f74931bf47dc 100644
--- a/lld/MachO/Driver.h
+++ b/lld/MachO/Driver.h
@@ -13,7 +13,7 @@
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/BinaryFormat/MachO.h"
-#include "llvm/Option/OptTable.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/MemoryBuffer.h"
#include <optional>
diff --git a/lld/MachO/Options.td b/lld/MachO/Options.td
index 70eb7c8b9e466b..f4b5cfa489c996 100644
--- a/lld/MachO/Options.td
+++ b/lld/MachO/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
multiclass BB<string name, string help1, string help2> {
def NAME: Flag<["--"], name>, HelpText<help1>;
diff --git a/lld/MinGW/Options.td b/lld/MinGW/Options.td
index ff7e21fa808f39..424c789d6ab44d 100644
--- a/lld/MinGW/Options.td
+++ b/lld/MinGW/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name>: Flag<["--", "-"], name>;
class J<string name>: Joined<["--", "-"], name>;
diff --git a/lld/wasm/Options.td b/lld/wasm/Options.td
index c5febd145a54f3..ecc9877fd8b5d3 100644
--- a/lld/wasm/Options.td
+++ b/lld/wasm/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
// Convenience classes for long options which only accept two dashes. For lld
// specific or newer long options, we prefer two dashes to avoid collision with
diff --git a/lldb/tools/driver/Options.td b/lldb/tools/driver/Options.td
index a24fb3826b9091..a1730560b7e261 100644
--- a/lldb/tools/driver/Options.td
+++ b/lldb/tools/driver/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name>: Flag<["--", "-"], name>;
class S<string name>: Separate<["--", "-"], name>;
diff --git a/lldb/tools/lldb-dap/Options.td b/lldb/tools/lldb-dap/Options.td
index d7b4a065abec01..a0b552526ba9d3 100644
--- a/lldb/tools/lldb-dap/Options.td
+++ b/lldb/tools/lldb-dap/Options.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name>: Flag<["--", "-"], name>;
class S<string name>: Separate<["--", "-"], name>;
diff --git a/lldb/tools/lldb-dap/lldb-dap.cpp b/lldb/tools/lldb-dap/lldb-dap.cpp
index db4dbbd6f6200a..5c3acb27bbc502 100644
--- a/lldb/tools/lldb-dap/lldb-dap.cpp
+++ b/lldb/tools/lldb-dap/lldb-dap.cpp
@@ -61,8 +61,8 @@
#include "llvm/ADT/StringExtras.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/Errno.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/InitLLVM.h"
diff --git a/lldb/tools/lldb-server/LLGSOptions.td b/lldb/tools/lldb-server/LLGSOptions.td
index 429a4671764f37..f1ba5a531a0f38 100644
--- a/lldb/tools/lldb-server/LLGSOptions.td
+++ b/lldb/tools/lldb-server/LLGSOptions.td
@@ -1,4 +1,4 @@
-include "llvm/Option/OptParser.td"
+include "llvm/Option/OptionParser.td"
class F<string name>: Flag<["--", "-"], name>;
class R<list<string> prefixes, string name>
diff --git a/lldb/tools/lldb-server/lldb-gdbserver.cpp b/lldb/tools/lldb-server/lldb-gdbserver.cpp
index d7503112697ef5..a22cc1b622b269 100644
--- a/lldb/tools/lldb-server/lldb-gdbserver.cpp
+++ b/lldb/tools/lldb-server/lldb-gdbserver.cpp
@@ -31,8 +31,8 @@
#include "lldb/Utility/Status.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Option/ArgList.h"
-#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionTable.h"
#include "llvm/Support/Errno.h"
#include "llvm/Support/Error.h"
#include "llvm/Support/WithColor.h"
diff --git a/llvm/include/llvm/Option/ArgList.h b/llvm/include/llvm/Option/ArgList.h
index 09812f976d0166..5725eaa1462ad8 100644
--- a/llvm/include/llvm/Option/ArgList.h
+++ b/llvm/include/llvm/Option/ArgList.h
@@ -11,14 +11,14 @@
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/iterator_range.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/Twine.h"
+#include "llvm/ADT/iterator_range.h"
#include "llvm/Option/Arg.h"
-#include "llvm/Option/OptSpecifier.h"
#include "llvm/Option/Option.h"
+#include "llvm/Option/OptionSpecifier.h"
#include <algorithm>
#include <cstddef>
#include <initializer_list>
diff --git a/llvm/include/llvm/Option/Option.h b/llvm/include/llvm/Option/Option.h
index 5d16fbdb6b77c8..76d3c237d8934d 100644
--- a/llvm/include/llvm/Option/Option.h
+++ b/llvm/include/llvm/Option/Option.h
@@...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/110692
More information about the flang-commits
mailing list