yaxunl created this revision. yaxunl added reviewers: thakis, tra. Herald added a subscriber: mgorny.
https://reviews.llvm.org/D71802 Files: clang/include/clang/Basic/OptionUtils.h clang/include/clang/Driver/OptionUtils.h clang/include/clang/Frontend/Utils.h clang/lib/Basic/CMakeLists.txt clang/lib/Basic/OptionUtils.cpp clang/lib/Driver/CMakeLists.txt clang/lib/Driver/OptionUtils.cpp
Index: clang/lib/Driver/OptionUtils.cpp =================================================================== --- /dev/null +++ clang/lib/Driver/OptionUtils.cpp @@ -0,0 +1,47 @@ +//===--- OptionUtils.cpp - Utilities for command line arguments -----------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/DiagnosticDriver.h" +#include "clang/Driver/OptionUtils.h" +#include "llvm/Option/ArgList.h" + +using namespace clang; +using namespace llvm::opt; + +namespace { +template <typename IntTy> +IntTy getLastArgIntValueImpl(const ArgList &Args, OptSpecifier Id, + IntTy Default, DiagnosticsEngine *Diags, + unsigned Base) { + IntTy Res = Default; + if (Arg *A = Args.getLastArg(Id)) { + if (StringRef(A->getValue()).getAsInteger(Base, Res)) { + if (Diags) + Diags->Report(diag::err_drv_invalid_int_value) + << A->getAsString(Args) << A->getValue(); + } + } + return Res; +} +} // namespace + +namespace clang { + +int getLastArgIntValue(const ArgList &Args, OptSpecifier Id, int Default, + DiagnosticsEngine *Diags, unsigned Base) { + return getLastArgIntValueImpl<int>(Args, Id, Default, Diags, Base); +} + +uint64_t getLastArgUInt64Value(const ArgList &Args, OptSpecifier Id, + uint64_t Default, DiagnosticsEngine *Diags, + unsigned Base) { + return getLastArgIntValueImpl<uint64_t>(Args, Id, Default, Diags, Base); +} + +} // namespace clang Index: clang/lib/Driver/CMakeLists.txt =================================================================== --- clang/lib/Driver/CMakeLists.txt +++ clang/lib/Driver/CMakeLists.txt @@ -19,6 +19,7 @@ DriverOptions.cpp Job.cpp Multilib.cpp + OptionUtils.cpp Phases.cpp SanitizerArgs.cpp Tool.cpp Index: clang/lib/Basic/OptionUtils.cpp =================================================================== --- clang/lib/Basic/OptionUtils.cpp +++ /dev/null @@ -1,47 +0,0 @@ -//===--- OptionUtils.cpp - Utilities for command line arguments -----------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#include "clang/Basic/OptionUtils.h" -#include "clang/Basic/Diagnostic.h" -#include "clang/Basic/DiagnosticDriver.h" -#include "llvm/Option/ArgList.h" - -using namespace clang; -using namespace llvm::opt; - -namespace { -template <typename IntTy> -IntTy getLastArgIntValueImpl(const ArgList &Args, OptSpecifier Id, - IntTy Default, DiagnosticsEngine *Diags, - unsigned Base) { - IntTy Res = Default; - if (Arg *A = Args.getLastArg(Id)) { - if (StringRef(A->getValue()).getAsInteger(Base, Res)) { - if (Diags) - Diags->Report(diag::err_drv_invalid_int_value) - << A->getAsString(Args) << A->getValue(); - } - } - return Res; -} -} // namespace - -namespace clang { - -int getLastArgIntValue(const ArgList &Args, OptSpecifier Id, int Default, - DiagnosticsEngine *Diags, unsigned Base) { - return getLastArgIntValueImpl<int>(Args, Id, Default, Diags, Base); -} - -uint64_t getLastArgUInt64Value(const ArgList &Args, OptSpecifier Id, - uint64_t Default, DiagnosticsEngine *Diags, - unsigned Base) { - return getLastArgIntValueImpl<uint64_t>(Args, Id, Default, Diags, Base); -} - -} // namespace clang Index: clang/lib/Basic/CMakeLists.txt =================================================================== --- clang/lib/Basic/CMakeLists.txt +++ clang/lib/Basic/CMakeLists.txt @@ -1,7 +1,6 @@ set(LLVM_LINK_COMPONENTS Core MC - Option Support ) @@ -56,7 +55,6 @@ ObjCRuntime.cpp OpenMPKinds.cpp OperatorPrecedence.cpp - OptionUtils.cpp SanitizerBlacklist.cpp SanitizerSpecialCaseList.cpp Sanitizers.cpp Index: clang/include/clang/Frontend/Utils.h =================================================================== --- clang/include/clang/Frontend/Utils.h +++ clang/include/clang/Frontend/Utils.h @@ -15,7 +15,7 @@ #include "clang/Basic/Diagnostic.h" #include "clang/Basic/LLVM.h" -#include "clang/Basic/OptionUtils.h" +#include "clang/Driver/OptionUtils.h" #include "clang/Frontend/DependencyOutputOptions.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/IntrusiveRefCntPtr.h" Index: clang/include/clang/Driver/OptionUtils.h =================================================================== --- /dev/null +++ clang/include/clang/Driver/OptionUtils.h @@ -0,0 +1,58 @@ +//===- OptionUtils.h - Utilities for command line arguments -----*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// This header contains utilities for command line arguments. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_CLANG_DRIVER_OPTIONUTILS_H +#define LLVM_CLANG_DRIVER_OPTIONUTILS_H + +#include "clang/Basic/Diagnostic.h" +#include "clang/Basic/LLVM.h" +#include "llvm/Option/OptSpecifier.h" + +namespace llvm { + +namespace opt { + +class ArgList; + +} // namespace opt + +} // namespace llvm + +namespace clang { +/// Return the value of the last argument as an integer, or a default. If Diags +/// is non-null, emits an error if the argument is given, but non-integral. +int getLastArgIntValue(const llvm::opt::ArgList &Args, + llvm::opt::OptSpecifier Id, int Default, + DiagnosticsEngine *Diags = nullptr, unsigned Base = 0); + +inline int getLastArgIntValue(const llvm::opt::ArgList &Args, + llvm::opt::OptSpecifier Id, int Default, + DiagnosticsEngine &Diags, unsigned Base = 0) { + return getLastArgIntValue(Args, Id, Default, &Diags, Base); +} + +uint64_t getLastArgUInt64Value(const llvm::opt::ArgList &Args, + llvm::opt::OptSpecifier Id, uint64_t Default, + DiagnosticsEngine *Diags = nullptr, + unsigned Base = 0); + +inline uint64_t getLastArgUInt64Value(const llvm::opt::ArgList &Args, + llvm::opt::OptSpecifier Id, + uint64_t Default, + DiagnosticsEngine &Diags, + unsigned Base = 0) { + return getLastArgUInt64Value(Args, Id, Default, &Diags, Base); +} + +} // namespace clang + +#endif // LLVM_CLANG_DRIVER_OPTIONUTILS_H Index: clang/include/clang/Basic/OptionUtils.h =================================================================== --- clang/include/clang/Basic/OptionUtils.h +++ /dev/null @@ -1,58 +0,0 @@ -//===- OptionUtils.h - Utilities for command line arguments -----*- C++ -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// -// -// This header contains utilities for command line arguments. -// -//===----------------------------------------------------------------------===// - -#ifndef LLVM_CLANG_BASIC_OPTIONUTILS_H -#define LLVM_CLANG_BASIC_OPTIONUTILS_H - -#include "clang/Basic/Diagnostic.h" -#include "clang/Basic/LLVM.h" -#include "llvm/Option/OptSpecifier.h" - -namespace llvm { - -namespace opt { - -class ArgList; - -} // namespace opt - -} // namespace llvm - -namespace clang { -/// Return the value of the last argument as an integer, or a default. If Diags -/// is non-null, emits an error if the argument is given, but non-integral. -int getLastArgIntValue(const llvm::opt::ArgList &Args, - llvm::opt::OptSpecifier Id, int Default, - DiagnosticsEngine *Diags = nullptr, unsigned Base = 0); - -inline int getLastArgIntValue(const llvm::opt::ArgList &Args, - llvm::opt::OptSpecifier Id, int Default, - DiagnosticsEngine &Diags, unsigned Base = 0) { - return getLastArgIntValue(Args, Id, Default, &Diags, Base); -} - -uint64_t getLastArgUInt64Value(const llvm::opt::ArgList &Args, - llvm::opt::OptSpecifier Id, uint64_t Default, - DiagnosticsEngine *Diags = nullptr, - unsigned Base = 0); - -inline uint64_t getLastArgUInt64Value(const llvm::opt::ArgList &Args, - llvm::opt::OptSpecifier Id, - uint64_t Default, - DiagnosticsEngine &Diags, - unsigned Base = 0) { - return getLastArgUInt64Value(Args, Id, Default, &Diags, Base); -} - -} // namespace clang - -#endif // LLVM_CLANG_BASIC_OPTIONUTILS_H
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
