Merge branch 'f-FixClangTidyIDEAnalyses' into f-ClangTidyFixIDESolver

Author: Martin Mory

.clang-tidy

@@ -5,6 +5,7 @@ Checks: '-*,
            -misc-non-private-member-variables-in-classes,
            -misc-no-recursion,
          readability-*,
+           -readability-function-cognitive-complexity,
            -readability-else-after*,
            -readability-simplify-boolean-expr,
            -readability-implicit-bool-cast,
@@ -48,6 +49,10 @@ CheckOptions:
     value:           CamelCase
   - key:             readability-identifier-naming.VariableCase
     value:           CamelCase
+  - key:             readability-identifier-naming.VariableIgnoredRegexp
+    value:           (c|d|d1|d2|d3|d4|d5|d5_restoredCtx|eP|f|f3|f4|f5|fCalleeSummary|g|n|dPrime|fPrime)
+  - key:             readability-identifier-naming.ParameterIgnoredRegexp
+    value:           (d|d1|d2|d3|d4|d5|eP|f|n)
   - key:             cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
     value:           1
   - key:             cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions

CMakeLists.txt

@@ -20,7 +20,7 @@ include(GNUInstallDirs)
 set_property(GLOBAL PROPERTY TARGET_MESSAGES OFF)
 
 if (NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "DebugSan" CACHE STRING "Build mode ('DebugSan' or 'Debug' or 'Release', default is 'DebugSan')" FORCE)
+  set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build mode ('DebugSan' or 'Debug' or 'Release', default is 'Debug')" FORCE)
 endif ()
 
 if(CMAKE_BUILD_TYPE STREQUAL "DebugSan")
@@ -57,6 +57,8 @@ option(PHASAR_BUILD_OPENSSL_TS_UNITTESTS "Build OPENSSL typestate tests (require
 
 option(PHASAR_BUILD_IR "Build IR test code (default is ON)" ON)
 
+option(PHASAR_ENABLE_CLANG_TIDY_DURING_BUILD "Run clang-tidy during build (default is OFF)" OFF)
+
 option(PHASAR_BUILD_DOC "Build documentation" OFF)
 
 option(PHASAR_DEBUG_LIBDEPS "Debug internal library dependencies (private linkage)" OFF)

include/phasar/Config/Configuration.h

@@ -35,47 +35,54 @@ namespace psr {
 class PhasarConfig {
 public:
   /// Current Phasar version
-  static std::string PhasarVersion() { return XSTR(PHASAR_VERSION); } // NOLINT
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  static std::string PhasarVersion() { return XSTR(PHASAR_VERSION); }
 
   /// Stores the label/ tag with which we annotate the LLVM IR.
-  static std::string MetaDataKind() { return "psr.id"; } // NOLINT
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  static std::string MetaDataKind() { return "psr.id"; }
 
-  static std::string ConfigurationDirectory() { // NOLINT
-    return ConfigDir;
-  }
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  static std::string ConfigurationDirectory() { return ConfigDir; }
 
   /// Specifies the directory in which Phasar is located.
-  static std::string PhasarDirectory() { return PhasarDir; } // NOLINT
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  static std::string PhasarDirectory() { return PhasarDir; }
 
   /// Name of the file storing all standard header search paths used for
   /// compilation.
-  static std::string HeaderSearchPathsFileName() { // NOLINT
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  static std::string HeaderSearchPathsFileName() {
     return "standard_header_paths.conf";
   }
 
   /// Name of the compile_commands.json file (in case we wish to rename)
-  static std::string CompileCommandsJson() { // NOLINT
-    return "compile_commands.json";
-  }
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  static std::string CompileCommandsJson() { return "compile_commands.json"; }
 
   /// Default Source- and Sink-Functions path
-  static std::string DefaultSourceSinkFunctionsPath() { // NOLINT
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  static std::string DefaultSourceSinkFunctionsPath() {
     return std::string(PhasarDirectory() +
                        "config/phasar-source-sink-function.json");
   }
 
   // Variables to be used in JSON export format
   /// Identifier for call graph export
-  static std::string JsonCallGraphID() { return "psr.cg"; } // NOLINT
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  static std::string JsonCallGraphID() { return "psr.cg"; }
 
   /// Identifier for type hierarchy graph export
-  static std::string JsonTypeHierarchyID() { return "psr.th"; } // NOLINT
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  static std::string JsonTypeHierarchyID() { return "psr.th"; }
 
   /// Identifier for points-to graph export
-  static std::string JsonPointsToGraphID() { return "psr.pt"; } // NOLINT
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  static std::string JsonPointsToGraphID() { return "psr.pt"; }
 
   /// Identifier for data-flow results export
-  static std::string JsonDataFlowID() { return "psr.df"; } // NOLINT
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  static std::string JsonDataFlowID() { return "psr.df"; }
 
   static PhasarConfig &getPhasarConfig();
 
@@ -94,16 +101,17 @@ class PhasarConfig {
   }
 
   /// Variables map of the parsed command-line parameters
-  static boost::program_options::variables_map &VariablesMap() { // NOLINT
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  static boost::program_options::variables_map &VariablesMap() {
     static boost::program_options::variables_map VMap;
     return VMap;
   }
 
   ~PhasarConfig() = default;
   PhasarConfig(const PhasarConfig &) = delete;
+  PhasarConfig operator=(const PhasarConfig &) = delete;
   PhasarConfig(PhasarConfig &&) = delete;
-  PhasarConfig &operator=(const PhasarConfig &) = delete;
-  PhasarConfig &operator=(PhasarConfig &&) = delete;
+  PhasarConfig operator=(PhasarConfig &&) = delete;
 
 private:
   PhasarConfig();

include/phasar/Controller/AnalysisController.h

@@ -128,8 +128,9 @@ class AnalysisController {
   ~AnalysisController() = default;
 
   AnalysisController(const AnalysisController &) = delete;
-
   AnalysisController(AnalysisController &&) = delete;
+  AnalysisController &operator=(const AnalysisController &) = delete;
+  AnalysisController &operator=(const AnalysisController &&) = delete;
 
   AnalysisController &operator=(const AnalysisController &) = delete;
 

include/phasar/PhasarLLVM/AnalysisStrategy/WholeProgramAnalysis.h

@@ -124,8 +124,9 @@ class WholeProgramAnalysis {
         DataFlowSolver(ProblemDesc) {}
 
   WholeProgramAnalysis(const WholeProgramAnalysis &) = delete;
-
   WholeProgramAnalysis(WholeProgramAnalysis &&) = delete;
+  WholeProgramAnalysis &operator=(WholeProgramAnalysis &) = delete;
+  WholeProgramAnalysis &operator=(WholeProgramAnalysis &&) = delete;
 
   WholeProgramAnalysis &operator=(WholeProgramAnalysis &) = delete;
 

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/DefaultSeeds.h

@@ -28,7 +28,7 @@ template <typename N, typename D> class DefaultSeeds {
   static std::map<N, std::set<D>> make(std::vector<N> Nodes, D ZeroNode) {
     std::map<N, std::set<D>> Result;
     for (N Node : Nodes) {
-      Result.insert(Node, {ZeroNode});
+      Result.insert(std::move(Node), {ZeroNode});
     }
     return Result;
   }

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h

@@ -274,7 +274,7 @@ class KillMultiple : public FlowFunction<D, Container> {
   KillMultiple(std::set<D> KillValues) : KillValues(std::move(KillValues)) {}
   ~KillMultiple() override = default;
   container_type computeTargets(D Source) override {
-    if (KillValues.count(Source)) {
+    if (KillValues.find(Source) != KillValues.end()) {
       return {};
     }
     return {Source};
@@ -295,6 +295,7 @@ class KillAll : public FlowFunction<D, Container> {
   container_type computeTargets(D /*Source*/) override {
     return container_type();
   }
+
   static std::shared_ptr<KillAll<D>> getInstance() {
     static std::shared_ptr<KillAll> Instance =
         std::shared_ptr<KillAll>(new KillAll);
@@ -358,7 +359,7 @@ class Transfer : public FlowFunction<D, Container> {
   using typename FlowFunction<D, Container>::container_type;
 
   Transfer(D ToValue, D FromValue) : ToValue(ToValue), FromValue(FromValue) {}
-  virtual ~Transfer() = default;
+  ~Transfer() override = default;
   container_type computeTargets(D Source) override {
     if (Source == FromValue) {
       return {Source, ToValue};
@@ -389,6 +390,7 @@ class Union : public FlowFunction<D, Container> {
           }
           return FlowFuncs;
         }()) {}
+
   ~Union() override = default;
   container_type computeTargets(D Source) override {
     container_type Result;

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h

@@ -35,7 +35,7 @@ class TraceStats {
 
   FunctionStats &getFunctionStats(const std::string &File);
   LineNumberStats &getLineNumberStats(const std::string &File,
-                                      const std::string &Function);
+                                      const std::string &FunctionName);
   FileStats Stats;
 };
 

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMFlowFunctions.h

@@ -45,6 +45,7 @@ class AutoKillTMPs : public FlowFunction<const llvm::Value *> {
 public:
   AutoKillTMPs(FlowFunctionPtrType FF, const llvm::Instruction *In)
       : Delegate(std::move(FF)), Inst(In) {}
+
   ~AutoKillTMPs() override = default;
 
   container_type computeTargets(const llvm::Value *Source) override {
@@ -403,6 +404,7 @@ template <typename D> class StrongUpdateStore : public FlowFunction<D> {
 public:
   StrongUpdateStore(const llvm::StoreInst *S, std::function<bool(D)> P)
       : Store(S), Predicate(std::move(P)) {}
+
   ~StrongUpdateStore() override = default;
 
   std::set<D> computeTargets(D Source) override {

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h

@@ -89,15 +89,17 @@ class AbstractMemoryLocationFactoryBase {
   const llvm::DataLayout *DL = nullptr;
 
   const detail::AbstractMemoryLocationImpl *
-  getOrCreateImpl(const llvm::Value *V, llvm::SmallVectorImpl<ptrdiff_t> &&Offs,
+  getOrCreateImpl(const llvm::Value *V, llvm::ArrayRef<ptrdiff_t> Offs,
                   unsigned BOUND);
 
   const detail::AbstractMemoryLocationImpl *
   getOrCreateImpl(const llvm::Value *V, unsigned BOUND);
 
   const AbstractMemoryLocationImpl *createImpl(const llvm::Value *V,
                                                unsigned BOUND);
+
   [[nodiscard]] const AbstractMemoryLocationImpl *getOrCreateZeroImpl() const;
+
   const AbstractMemoryLocationImpl *
   withIndirectionOfImpl(const AbstractMemoryLocationImpl *AML,
                         llvm::ArrayRef<ptrdiff_t> Ind);
@@ -160,6 +162,7 @@ class AbstractMemoryLocationFactory<AbstractMemoryLocation>
                                               unsigned BOUND) {
     return {createImpl(V, BOUND)};
   }
+
   [[nodiscard]] AbstractMemoryLocation getOrCreateZero() const {
     return {getOrCreateZeroImpl()};
   }