more cleanups

Author: cor3ntin

clang/include/clang/AST/TemplateBase.h

@@ -475,6 +475,7 @@ class TemplateArgument {
   /// Used to insert TemplateArguments into FoldingSets.
   void Profile(llvm::FoldingSetNodeID &ID, const ASTContext &Context) const;
 };
+
 /// Location information for a TemplateArgument.
 struct TemplateArgumentLocInfo {
   struct TemplateTemplateArgLocInfo {

clang/include/clang/Sema/Sema.h

@@ -13085,6 +13085,7 @@ class Sema final : public SemaBase {
     /// Whether we're substituting into constraints.
     bool InConstraintSubstitution;
 
+    /// Whether we're substituting into the parameter mapping of a constraint.
     bool InParameterMappingSubstitution;
 
     /// The point of instantiation or synthesis within the source code.
@@ -14842,10 +14843,18 @@ class Sema final : public SemaBase {
       const NamedDecl *D1, ArrayRef<AssociatedConstraint> AC1,
       const NamedDecl *D2, ArrayRef<AssociatedConstraint> AC2);
 
-  llvm::DenseMap<llvm::FoldingSetNodeID, CachedConceptIdConstraint>
-      ConceptIdSatisfactionCache;
+  /// Cache the satisfaction of an atomic constraint.
+  /// The key is based on the unsubstituted expression and the parameter
+  /// mapping. This lets us not substituting the mapping more than once,
+  /// which is (very!) expensive.
+  /// FIXME: this should be private.
+  llvm::DenseMap<llvm::FoldingSetNodeID,
+                 UnsubstitutedConstraintSatisfactionCacheResult>
+      UnsubstitutedConstraintSatisfactionCache;
 
 private:
+  friend class CalculateConstraintSatisfaction;
+
   /// Caches pairs of template-like decls whose associated constraints were
   /// checked for subsumption and whether or not the first's constraints did in
   /// fact subsume the second's.
@@ -14858,6 +14867,8 @@ class Sema final : public SemaBase {
   llvm::DenseMap<ConstrainedDeclOrNestedRequirement, NormalizedConstraint *>
       NormalizationCache;
 
+  /// Cache whether the associated constraint of a declaration
+  /// is satisfied.
   llvm::ContextualFoldingSet<ConstraintSatisfaction, const ASTContext &>
       SatisfactionCache;
 

clang/include/clang/Sema/SemaConcept.h

@@ -18,15 +18,11 @@
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprConcepts.h"
 #include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/UnsignedOrNone.h"
 #include "clang/Sema/Ownership.h"
-#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/FoldingSet.h"
-#include "llvm/ADT/STLForwardCompat.h"
 #include "llvm/ADT/STLFunctionalExtras.h"
 #include "llvm/ADT/SmallBitVector.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/Support/Compiler.h"
 #include <optional>
 #include <utility>
 
@@ -37,17 +33,19 @@ class MultiLevelTemplateArgumentList;
 /// \brief A normalized constraint, as defined in C++ [temp.constr.normal], is
 /// either an atomic constraint, a conjunction of normalized constraints or a
 /// disjunction of normalized constraints.
-
 struct NormalizedConstraint {
 
-  enum class ConstraintKind : unsigned char{
+  enum class ConstraintKind : unsigned char {
     Atomic = 0,
     ConceptId,
     FoldExpanded,
     Compound,
   };
 
-  enum CompoundConstraintKind : unsigned char { CCK_Conjunction, CCK_Disjunction };
+  enum CompoundConstraintKind : unsigned char {
+    CCK_Conjunction,
+    CCK_Disjunction
+  };
   enum class FoldOperatorKind : unsigned char { And, Or };
 
   using OccurenceList = llvm::SmallBitVector;
@@ -393,7 +391,7 @@ class ConceptIdConstraint : public NormalizedConstraintWithParamMapping {
   NormalizedConstraint &getNormalizedConstraint() { return *ConceptId.Sub; }
 };
 
-struct CachedConceptIdConstraint {
+struct UnsubstitutedConstraintSatisfactionCacheResult {
   ExprResult SubstExpr;
   ConstraintSatisfaction Satisfaction;
 };