[PATCH] D105005: [analyzer][solver][NFC] Simplify function signatures

2021-06-28 Thread Valeriy Savchenko via Phabricator via cfe-commits 
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG8474bb13c327: [analyzer][solver][NFC] Simplify function 
signatures (authored by vsavchenko).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D105005/new/

https://reviews.llvm.org/D105005

Files:
  
clang/include/clang/StaticAnalyzer/Core/PathSensitive/RangedConstraintManager.h
  clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp

Index: clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
===
--- clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
+++ clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
@@ -549,14 +549,13 @@
  SymbolRef Sym);
 
   /// Merge classes for the given symbols and return a new state.
-  LLVM_NODISCARD static inline ProgramStateRef
-  merge(BasicValueFactory , RangeSet::Factory , ProgramStateRef State,
-SymbolRef First, SymbolRef Second);
+  LLVM_NODISCARD static inline ProgramStateRef merge(RangeSet::Factory ,
+ ProgramStateRef State,
+ SymbolRef First,
+ SymbolRef Second);
   // Merge this class with the given class and return a new state.
-  LLVM_NODISCARD inline ProgramStateRef merge(BasicValueFactory ,
-  RangeSet::Factory ,
-  ProgramStateRef State,
-  EquivalenceClass Other);
+  LLVM_NODISCARD inline ProgramStateRef
+  merge(RangeSet::Factory , ProgramStateRef State, EquivalenceClass Other);
 
   /// Return a set of class members for the given state.
   LLVM_NODISCARD inline SymbolSet getClassMembers(ProgramStateRef State) const;
@@ -567,15 +566,14 @@
  SymbolReaper ) const;
 
   LLVM_NODISCARD static inline ProgramStateRef
-  markDisequal(BasicValueFactory , RangeSet::Factory ,
-   ProgramStateRef State, SymbolRef First, SymbolRef Second);
+  markDisequal(RangeSet::Factory , ProgramStateRef State, SymbolRef First,
+   SymbolRef Second);
   LLVM_NODISCARD static inline ProgramStateRef
-  markDisequal(BasicValueFactory , RangeSet::Factory ,
-   ProgramStateRef State, EquivalenceClass First,
-   EquivalenceClass Second);
+  markDisequal(RangeSet::Factory , ProgramStateRef State,
+   EquivalenceClass First, EquivalenceClass Second);
   LLVM_NODISCARD inline ProgramStateRef
-  markDisequal(BasicValueFactory , RangeSet::Factory ,
-   ProgramStateRef State, EquivalenceClass Other) const;
+  markDisequal(RangeSet::Factory , ProgramStateRef State,
+   EquivalenceClass Other) const;
   LLVM_NODISCARD static inline ClassSet
   getDisequalClasses(ProgramStateRef State, SymbolRef Sym);
   LLVM_NODISCARD inline ClassSet
@@ -641,15 +639,13 @@
   }
   static inline SymbolSet::Factory (ProgramStateRef State);
 
-  inline ProgramStateRef mergeImpl(BasicValueFactory , RangeSet::Factory ,
-   ProgramStateRef State, SymbolSet Members,
-   EquivalenceClass Other,
+  inline ProgramStateRef mergeImpl(RangeSet::Factory , ProgramStateRef State,
+   SymbolSet Members, EquivalenceClass Other,
SymbolSet OtherMembers);
   static inline bool
   addToDisequalityInfo(DisequalityMapTy , ConstraintRangeTy ,
-   BasicValueFactory , RangeSet::Factory ,
-   ProgramStateRef State, EquivalenceClass First,
-   EquivalenceClass Second);
+   RangeSet::Factory , ProgramStateRef State,
+   EquivalenceClass First, EquivalenceClass Second);
 
   /// This is a unique identifier of the class.
   uintptr_t ID;
@@ -740,8 +736,7 @@
 //===--===//
 
 template 
-LLVM_NODISCARD inline RangeSet intersect(BasicValueFactory ,
- RangeSet::Factory , RangeSet Head,
+LLVM_NODISCARD inline RangeSet intersect(RangeSet::Factory , RangeSet Head,
  SecondTy Second, RestTy... Tail);
 
 template  struct IntersectionTraits;
@@ -764,15 +759,14 @@
 };
 
 template 
-LLVM_NODISCARD inline EndTy intersect(BasicValueFactory ,
-  RangeSet::Factory , EndTy End) {
+LLVM_NODISCARD inline EndTy intersect(RangeSet::Factory , EndTy End) {
   // If the list contains only RangeSet or Optional, simply return
   // that range set.
   return End;
 }
 
 LLVM_NODISCARD LLVM_ATTRIBUTE_UNUSED inline Optional

[PATCH] D105005: [analyzer][solver][NFC] Simplify function signatures

2021-06-28 Thread Gabor Marton via Phabricator via cfe-commits 
martong accepted this revision.
martong added a comment.
This revision is now accepted and ready to land.

LGTM! Thanks!


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D105005/new/

https://reviews.llvm.org/D105005

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D105005: [analyzer][solver][NFC] Simplify function signatures

2021-06-28 Thread Valeriy Savchenko via Phabricator via cfe-commits 
vsavchenko created this revision.
vsavchenko added reviewers: NoQ, xazax.hun, martong, steakhal, Szelethus, 
ASDenysPetrov, manas, RedDocMD.
Herald added subscribers: dkrupp, donat.nagy, mikhail.ramalho, a.sidorin, 
rnkovacs, szepet, baloghadamsoftware.
vsavchenko requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Since RangeSet::Factory actually contains BasicValueFactory, we can
remove value factory from many function signatures inside the solver.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D105005

Files:
  
clang/include/clang/StaticAnalyzer/Core/PathSensitive/RangedConstraintManager.h
  clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp

Index: clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
===
--- clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
+++ clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
@@ -549,14 +549,13 @@
  SymbolRef Sym);
 
   /// Merge classes for the given symbols and return a new state.
-  LLVM_NODISCARD static inline ProgramStateRef
-  merge(BasicValueFactory , RangeSet::Factory , ProgramStateRef State,
-SymbolRef First, SymbolRef Second);
+  LLVM_NODISCARD static inline ProgramStateRef merge(RangeSet::Factory ,
+ ProgramStateRef State,
+ SymbolRef First,
+ SymbolRef Second);
   // Merge this class with the given class and return a new state.
-  LLVM_NODISCARD inline ProgramStateRef merge(BasicValueFactory ,
-  RangeSet::Factory ,
-  ProgramStateRef State,
-  EquivalenceClass Other);
+  LLVM_NODISCARD inline ProgramStateRef
+  merge(RangeSet::Factory , ProgramStateRef State, EquivalenceClass Other);
 
   /// Return a set of class members for the given state.
   LLVM_NODISCARD inline SymbolSet getClassMembers(ProgramStateRef State) const;
@@ -567,15 +566,14 @@
  SymbolReaper ) const;
 
   LLVM_NODISCARD static inline ProgramStateRef
-  markDisequal(BasicValueFactory , RangeSet::Factory ,
-   ProgramStateRef State, SymbolRef First, SymbolRef Second);
+  markDisequal(RangeSet::Factory , ProgramStateRef State, SymbolRef First,
+   SymbolRef Second);
   LLVM_NODISCARD static inline ProgramStateRef
-  markDisequal(BasicValueFactory , RangeSet::Factory ,
-   ProgramStateRef State, EquivalenceClass First,
-   EquivalenceClass Second);
+  markDisequal(RangeSet::Factory , ProgramStateRef State,
+   EquivalenceClass First, EquivalenceClass Second);
   LLVM_NODISCARD inline ProgramStateRef
-  markDisequal(BasicValueFactory , RangeSet::Factory ,
-   ProgramStateRef State, EquivalenceClass Other) const;
+  markDisequal(RangeSet::Factory , ProgramStateRef State,
+   EquivalenceClass Other) const;
   LLVM_NODISCARD static inline ClassSet
   getDisequalClasses(ProgramStateRef State, SymbolRef Sym);
   LLVM_NODISCARD inline ClassSet
@@ -636,15 +634,13 @@
   }
   static inline SymbolSet::Factory (ProgramStateRef State);
 
-  inline ProgramStateRef mergeImpl(BasicValueFactory , RangeSet::Factory ,
-   ProgramStateRef State, SymbolSet Members,
-   EquivalenceClass Other,
+  inline ProgramStateRef mergeImpl(RangeSet::Factory , ProgramStateRef State,
+   SymbolSet Members, EquivalenceClass Other,
SymbolSet OtherMembers);
   static inline bool
   addToDisequalityInfo(DisequalityMapTy , ConstraintRangeTy ,
-   BasicValueFactory , RangeSet::Factory ,
-   ProgramStateRef State, EquivalenceClass First,
-   EquivalenceClass Second);
+   RangeSet::Factory , ProgramStateRef State,
+   EquivalenceClass First, EquivalenceClass Second);
 
   /// This is a unique identifier of the class.
   uintptr_t ID;
@@ -735,8 +731,7 @@
 //===--===//
 
 template 
-LLVM_NODISCARD inline RangeSet intersect(BasicValueFactory ,
- RangeSet::Factory , RangeSet Head,
+LLVM_NODISCARD inline RangeSet intersect(RangeSet::Factory , RangeSet Head,
  SecondTy Second, RestTy... Tail);
 
 template  struct IntersectionTraits;
@@ -759,15 +754,14 @@
 };
 
 template 
-LLVM_NODISCARD inline EndTy intersect(BasicValueFactory ,
-  RangeSet::Factory , EndTy End) {
+LLVM_NODISCARD inline EndTy