cleanups

Author: cor3ntin

clang/include/clang/Sema/SemaConcept.h

@@ -63,19 +63,23 @@ struct NormalizedConstraint {
   using ExprOrConcept =
       llvm::PointerUnion<const Expr *, const ConceptReference *>;
 
-  struct AtomicBits {
+  struct AtomicConstraintBits {
     LLVM_PREFERRED_TYPE(ConstraintKind)
+    // Kind is the first member of all union members,
+    // as we rely on their initial common sequence.
     unsigned Kind : 5;
     unsigned Placeholder : 1;
     unsigned PackSubstitutionIndex : 26;
+    // Indexes and Args are part of the common initial sequences
+    // of constraints that do have a mapping.
     OccurenceList Indexes;
     TemplateArgumentLoc *Args;
     TemplateParameterList *ParamList;
     ExprOrConcept ConstraintExpr;
     const NamedDecl *ConstraintDecl;
   };
 
-  struct FoldExpandedBits {
+  struct FoldExpandedConstraintBits {
     LLVM_PREFERRED_TYPE(ConstraintKind)
     unsigned Kind : 5;
     LLVM_PREFERRED_TYPE(FoldOperatorKind)
@@ -89,14 +93,14 @@ struct NormalizedConstraint {
     NormalizedConstraint *Constraint;
   };
 
-  struct ConceptIdBits : AtomicBits {
+  struct ConceptIdBits : AtomicConstraintBits {
     NormalizedConstraint *Sub;
 
     // Only used for parameter mapping.
     const ConceptSpecializationExpr *CSE;
   };
 
-  struct CompoundBits {
+  struct CompoundConstraintBits {
     LLVM_PREFERRED_TYPE(ConstraintKind)
     unsigned Kind : 5;
     LLVM_PREFERRED_TYPE(CompoundConstraintKind)
@@ -106,10 +110,10 @@ struct NormalizedConstraint {
   };
 
   union {
-    AtomicBits Atomic;
-    FoldExpandedBits FoldExpanded;
+    AtomicConstraintBits Atomic;
+    FoldExpandedConstraintBits FoldExpanded;
     ConceptIdBits ConceptId;
-    CompoundBits Compound;
+    CompoundConstraintBits Compound;
   };
 
   ~NormalizedConstraint() {
@@ -161,6 +165,8 @@ struct NormalizedConstraint {
                  llvm::to_underlying(CCK), LHS, RHS} {}
 
   bool hasParameterMapping() const {
+    // compound constraints do not have a mapping
+    // and Args is not part of their common initial sequence.
     return getKind() != ConstraintKind::Compound && Atomic.Args != nullptr;
   }
 
@@ -388,9 +394,6 @@ class ConceptIdConstraint : public NormalizedConstraintWithParamMapping {
 };
 
 struct CachedConceptIdConstraint {
-#ifndef NDEBUG
-  const Expr *E;
-#endif
   ExprResult SubstExpr;
   ConstraintSatisfaction Satisfaction;
 };

clang/include/clang/Sema/Template.h

@@ -240,28 +240,16 @@ enum class TemplateSubstitutionKind : char {
              "Replacing in an empty list?");
 
       if (!TemplateArgumentLists.empty()) {
-        // assert((!TemplateArgumentLists[0].AssociatedDeclAndFinal.getPointer()
-        // ||
-        //         TemplateArgumentLists[0].AssociatedDeclAndFinal.getPointer()
-        //         ==
-        //             AssociatedDecl) &&
-        //         "Trying to change incorrect declaration?");
         TemplateArgumentLists[0].Args = Args;
-      } else {
-        --NumRetainedOuterLevels;
-        TemplateArgumentLists.push_back(
-            {{AssociatedDecl, /*Final=*/Final}, Args});
+        return;
       }
+      --NumRetainedOuterLevels;
+      TemplateArgumentLists.push_back(
+          {{AssociatedDecl, /*Final=*/Final}, Args});
     }
 
     void replaceOutermostTemplateArguments(Decl *AssociatedDecl, ArgList Args) {
       assert((!TemplateArgumentLists.empty()) && "Replacing in an empty list?");
-      // assert((!TemplateArgumentLists.back().AssociatedDeclAndFinal.getPointer()
-      // ||
-      //         TemplateArgumentLists.back().AssociatedDeclAndFinal.getPointer()
-      //         ==
-      //             AssociatedDecl) &&
-      //        "Trying to change incorrect declaration?");
       TemplateArgumentLists.back().AssociatedDeclAndFinal.setPointer(
           AssociatedDecl);
       TemplateArgumentLists.back().Args = Args;

clang/lib/AST/ASTContext.cpp

@@ -5793,7 +5793,6 @@ QualType ASTContext::getSubstTemplateTypeParmType(QualType Replacement,
   llvm::FoldingSetNodeID ID;
   SubstTemplateTypeParmType::Profile(ID, Replacement, AssociatedDecl, Index,
                                      PackIndex, Final);
-
   void *InsertPos = nullptr;
   SubstTemplateTypeParmType *SubstParm =
       SubstTemplateTypeParmTypes.FindNodeOrInsertPos(ID, InsertPos);

clang/lib/Sema/SemaConcept.cpp

@@ -17,7 +17,6 @@
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/DeclTemplate.h"
-#include "clang/AST/DependenceFlags.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprConcepts.h"
 #include "clang/AST/RecursiveASTVisitor.h"
@@ -32,20 +31,10 @@
 #include "clang/Sema/SemaInternal.h"
 #include "clang/Sema/Template.h"
 #include "clang/Sema/TemplateDeduction.h"
-#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/PointerUnion.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/ScopeExit.h"
-#include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/Casting.h"
 #include "llvm/Support/SaveAndRestore.h"
-#include "llvm/Support/raw_ostream.h"
-#include <chrono>
-#include <cstddef>
-#include <iterator>
-#include <optional>
 
 using namespace clang;
 using namespace sema;
@@ -691,9 +680,7 @@ ExprResult CalculateConstraintSatisfaction::Calculate(
       Constraint.getPackSubstitutionIndex()
           ? Constraint.getPackSubstitutionIndex()
           : PackSubstitutionIndex;
-  // Constraint.getConstraintExpr()->Profile(ID, S.Context, /*Canonical=*/true,
-  //                                         /*ProfileLambdaExpr=*/true);
-  auto *Previous = Constraint.getConstraintExpr();
+
   ID.AddPointer(Constraint.getConstraintExpr());
   ID.AddInteger(OuterPackSubstIndex.toInternalRepresentation());
   ID.AddBoolean(Constraint.hasParameterMapping());
@@ -713,15 +700,12 @@ ExprResult CalculateConstraintSatisfaction::Calculate(
 
   ExprResult E = CalculateSlow(Constraint, MLTAL);
 
-  assert(Constraint.getConstraintExpr() == Previous);
-
   CachedConceptIdConstraint Cache;
   Cache.Satisfaction.ContainsErrors = Satisfaction.ContainsErrors;
   Cache.Satisfaction.IsSatisfied = Satisfaction.IsSatisfied;
   std::copy(Satisfaction.Details.begin() + Size, Satisfaction.Details.end(),
             std::back_inserter(Cache.Satisfaction.Details));
   Cache.SubstExpr = E;
-  Cache.E = Constraint.getConstraintExpr();
   S.ConceptIdSatisfactionCache.insert({ID, std::move(Cache)});
 
   return E;
@@ -2153,8 +2137,6 @@ NormalizedConstraint *NormalizedConstraint::fromConstraintExpr(
       if (!SubNF)
         return nullptr;
     }
-    // if (substituteParameterMappings(S, *SubNF, CSE))
-    //   return nullptr;
 
     return ConceptIdConstraint::Create(S.getASTContext(),
                                        CSE->getConceptReference(), SubNF, D,

clang/lib/Sema/SemaTemplate.cpp

@@ -6069,19 +6069,6 @@ bool Sema::CheckTemplateArgumentList(
         return true;
       }
 
-      // For constraint parameter mapping, we have already built a pack in
-      // TransformTemplateArguments
-      // if (inParameterMappingSubstitution()) {
-      //   llvm::copy(SugaredArgumentPack,
-      //   std::back_inserter(CTAI.SugaredConverted));
-      //   SugaredArgumentPack.clear();
-      //   llvm::copy(CanonicalArgumentPack,
-      //   std::back_inserter(CTAI.CanonicalConverted));
-      //   CanonicalArgumentPack.clear();
-      //   ++Param;
-      //   continue;
-      // }
-
       CTAI.SugaredConverted.push_back(
           TemplateArgument::CreatePackCopy(Context, SugaredArgumentPack));
       SugaredArgumentPack.clear();

clang/lib/Sema/TreeTransform.h

@@ -356,8 +356,6 @@ class TreeTransform {
   /// being expanded.
   void ExpandingFunctionParameterPack(ParmVarDecl *Pack) { }
 
-  bool ShouldPreserveTemplateArgumentsPacks() const { return false; }
-
   /// Transforms the given type into another type.
   ///
   /// By default, this routine transforms a type by creating a

clang/test/CXX/temp/temp.constr/temp.constr.normal/p1.cpp

@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -std=c++2a -x c++ -verify %s
-// FIXME: RUN: %clang_cc1 -std=c++2c -x c++ -verify %s
+// RUN: %clang_cc1 -std=c++2c -x c++ -verify %s
 
 template<typename T> concept True = true;
 template<typename T> concept Foo = True<T*>; // #Foo