https://github.com/steakhal created https://github.com/llvm/llvm-project/pull/121910
This simplifies #120239 Addresses my comment at: https://github.com/llvm/llvm-project/pull/120239#issuecomment-2574600543 >From 49bac3d08faee3fe962326b69ac4cb49a07643af Mon Sep 17 00:00:00 2001 From: Balazs Benics <benicsbal...@gmail.com> Date: Tue, 7 Jan 2025 11:20:38 +0100 Subject: [PATCH] [analyzer] Simplify PositiveAnalyzerOption handling This simplifies #120239 Addresses my comment at: https://github.com/llvm/llvm-project/pull/120239#issuecomment-2574600543 --- .../StaticAnalyzer/Core/AnalyzerOptions.h | 19 ++++++++++++------- clang/lib/Frontend/CompilerInvocation.cpp | 4 +--- .../StaticAnalyzer/Z3CrosscheckOracleTest.cpp | 11 +---------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h b/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h index 3f341ecf8c1e4f..2c970301879d24 100644 --- a/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h +++ b/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h @@ -126,11 +126,18 @@ enum class CTUPhase1InliningKind { None, Small, All }; class PositiveAnalyzerOption { public: - PositiveAnalyzerOption() = default; - PositiveAnalyzerOption(const PositiveAnalyzerOption &) = default; - PositiveAnalyzerOption &operator=(const PositiveAnalyzerOption &) = default; + constexpr PositiveAnalyzerOption() = default; + constexpr PositiveAnalyzerOption(unsigned Value) : Value(Value) { + assert(Value > 0 && "only positive values are accepted"); + } + constexpr PositiveAnalyzerOption(const PositiveAnalyzerOption &) = default; + constexpr PositiveAnalyzerOption & + operator=(const PositiveAnalyzerOption &Other) { + Value = Other.Value; + return *this; + } - static std::optional<PositiveAnalyzerOption> create(unsigned Val) { + static constexpr std::optional<PositiveAnalyzerOption> create(unsigned Val) { if (Val == 0) return std::nullopt; return PositiveAnalyzerOption{Val}; @@ -141,11 +148,9 @@ class PositiveAnalyzerOption { return std::nullopt; return PositiveAnalyzerOption::create(Parsed); } - operator unsigned() const { return Value; } + constexpr operator unsigned() const { return Value; } private: - explicit constexpr PositiveAnalyzerOption(unsigned Value) : Value(Value) {} - unsigned Value = 1; }; diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 6e47b374d4ed86..d711df02ce9503 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -1274,9 +1274,7 @@ static void initOption(AnalyzerOptions::ConfigTable &Config, Diags->Report(diag::err_analyzer_config_invalid_input) << Name << "a positive"; - auto Default = PositiveAnalyzerOption::create(DefaultVal); - assert(Default.has_value()); - OptionField = Default.value(); + OptionField = DefaultVal; } static void parseAnalyzerConfigs(AnalyzerOptions &AnOpts, diff --git a/clang/unittests/StaticAnalyzer/Z3CrosscheckOracleTest.cpp b/clang/unittests/StaticAnalyzer/Z3CrosscheckOracleTest.cpp index ed8627c500098a..626f5c163d17d0 100644 --- a/clang/unittests/StaticAnalyzer/Z3CrosscheckOracleTest.cpp +++ b/clang/unittests/StaticAnalyzer/Z3CrosscheckOracleTest.cpp @@ -27,22 +27,13 @@ static constexpr std::optional<bool> UNDEF = std::nullopt; static unsigned operator""_ms(unsigned long long ms) { return ms; } static unsigned operator""_step(unsigned long long rlimit) { return rlimit; } -template <class Ret, class Arg> static Ret makeDefaultOption(Arg Value) { - return Value; -} -template <> PositiveAnalyzerOption makeDefaultOption(int Value) { - auto DefaultVal = PositiveAnalyzerOption::create(Value); - assert(DefaultVal.has_value()); - return DefaultVal.value(); -} - static const AnalyzerOptions DefaultOpts = [] { AnalyzerOptions Config; #define ANALYZER_OPTION_DEPENDS_ON_USER_MODE(TYPE, NAME, CMDFLAG, DESC, \ SHALLOW_VAL, DEEP_VAL) \ ANALYZER_OPTION(TYPE, NAME, CMDFLAG, DESC, DEEP_VAL) #define ANALYZER_OPTION(TYPE, NAME, CMDFLAG, DESC, DEFAULT_VAL) \ - Config.NAME = makeDefaultOption<TYPE>(DEFAULT_VAL); + Config.NAME = DEFAULT_VAL; #include "clang/StaticAnalyzer/Core/AnalyzerOptions.def" // Remember to update the tests in this file when these values change. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
