Summary: Fix ArgsAsWritten being null for ConceptSpecializationExpr in certain circumstances when parsing ASTs

[yeswalrus]

Summary

Fix ArgsAsWritten being null for ConceptSpecializationExpr in certain circumstances when parsing ASTs

ASTStmtWriter::VisitConceptSpecializationExpr specifically expects getTemplateArgsAsWritten() to return true, which it wasn't when parsed by ASTContext.cpp in certain edge cases.

[yeswalrus]

Solves issue: https://github.com/llvm/llvm-project/issues/61486

[yeswalrus]

@erichkeane What are the next steps to make this land? Looks like the build servers have been stuck waiting for an agent for over 24h

[erichkeane]

While I'd definitely like to see the pre-commit bots finish before committing this, Aaron tells me there seems to be a series of problems (we had an outage earlier this week, we might be seeing more from it!). Feel free to commit without waiting, post-commit works, so they can catch anything that went wrong.

Do you need someone to commit this for you? If so, let us know, and respond with "Your Name <EmailToCommitUnder>".

[yeswalrus]

-I can handle it. -
Edit: I cannot handle it, I don't have commit access. If you could commit to both main and the 16.x lines with the attribution to Walter Gray <[e-mail]> that would be much appreciated. Thanks!

[erichkeane]

In D146678#4220360, @yeswalrus wrote:

-I can handle it. -
Edit: I cannot handle it, I don't have commit access. If you could commit to both main and the 16.x lines with the attribution to Walter Gray <[e-mail]> that would be much appreciated. Thanks!

You already have commit rights? Ok then. In order to get this merged into the 16 release, you need to create a github issue to cherry-pick it, and add it to the https://github.com/llvm/llvm-project/milestone/21 milestone.

[shafik]

clang/lib/AST/ASTContext.cpp

845

nit follow clang-tidy bugprone-argument-comment convention

[yeswalrus]

Fix Nit

[yeswalrus]

In D146678#4220408, @erichkeane wrote:

In D146678#4220360, @yeswalrus wrote:

-I can handle it. -
Edit: I cannot handle it, I don't have commit access. If you could commit to both main and the 16.x lines with the attribution to Walter Gray <[e-mail]> that would be much appreciated. Thanks!

You already have commit rights? Ok then. In order to get this merged into the 16 release, you need to create a github issue to cherry-pick it, and add it to the https://github.com/llvm/llvm-project/milestone/21 milestone.

I think there was a mixup. While I initially thought I could handle it, I do not in fact have commit rights.

[erichkeane]

In D146678#4229052, @yeswalrus wrote:

In D146678#4220408, @erichkeane wrote:

In D146678#4220360, @yeswalrus wrote:

-I can handle it. -
Edit: I cannot handle it, I don't have commit access. If you could commit to both main and the 16.x lines with the attribution to Walter Gray <[e-mail]> that would be much appreciated. Thanks!

You already have commit rights? Ok then. In order to get this merged into the 16 release, you need to create a github issue to cherry-pick it, and add it to the https://github.com/llvm/llvm-project/milestone/21 milestone.

I think there was a mixup. While I initially thought I could handle it, I do not in fact have commit rights.

Ok, not a problem! I need you to provide your requested 'author' string in the form of: "Your Name <[e-mail]>"

[yeswalrus]

"Walter Gray<[e-mail]>"
Thank you, and sorry about the back and forth.

clang/include/clang/AST/ExprConcepts.h

ConceptSpecializationExpr(const ASTContext &C, NestedNameSpecifierLoc NNS,
                             SourceLocation TemplateKWLoc,
                             DeclarationNameInfo ConceptNameInfo,
                             NamedDecl *FoundDecl, ConceptDecl *NamedConcept,
                             const ASTTemplateArgumentListInfo *ArgsAsWritten,
                             ImplicitConceptSpecializationDecl *SpecDecl,
                             const ConstraintSatisfaction *Satisfaction);
 
   ConceptSpecializationExpr(const ASTContext &C, ConceptDecl *NamedConcept,
+                            const ASTTemplateArgumentListInfo *ArgsAsWritten,
                             ImplicitConceptSpecializationDecl *SpecDecl,
                             const ConstraintSatisfaction *Satisfaction,
                             bool Dependent,
                             bool ContainsUnexpandedParameterPack);
   ConceptSpecializationExpr(EmptyShell Empty);
 
 public:
   static ConceptSpecializationExpr *
   Create(const ASTContext &C, NestedNameSpecifierLoc NNS,
          SourceLocation TemplateKWLoc, DeclarationNameInfo ConceptNameInfo,
          NamedDecl *FoundDecl, ConceptDecl *NamedConcept,
          const ASTTemplateArgumentListInfo *ArgsAsWritten,
          ImplicitConceptSpecializationDecl *SpecDecl,
          const ConstraintSatisfaction *Satisfaction);
 
   static ConceptSpecializationExpr *
   Create(const ASTContext &C, ConceptDecl *NamedConcept,
+         const ASTTemplateArgumentListInfo *ArgsAsWritten,
          ImplicitConceptSpecializationDecl *SpecDecl,
          const ConstraintSatisfaction *Satisfaction, bool Dependent,
          bool ContainsUnexpandedParameterPack);
 
   ArrayRef<TemplateArgument> getTemplateArguments() const {
     return SpecDecl->getTemplateArguments();
   }
 

clang/lib/AST/ASTContext.cpp

if (OldConverted.front().getKind() == TemplateArgument::Pack) {
     NewConverted.push_back(ConstrainedType);
     llvm::append_range(NewConverted, OldConverted.drop_front(1));
   }
   auto *CSD = ImplicitConceptSpecializationDecl::Create(
       C, CSE->getNamedConcept()->getDeclContext(),
       CSE->getNamedConcept()->getLocation(), NewConverted);
 
   Expr *NewIDC = ConceptSpecializationExpr::Create(
-      C, CSE->getNamedConcept(), CSD, nullptr, CSE->isInstantiationDependent(),
+      C, CSE->getNamedConcept(), CSE->getTemplateArgsAsWritten(), CSD,
+      /*Satisfaction=*/nullptr, CSE->isInstantiationDependent(),
       CSE->containsUnexpandedParameterPack());
 
   if (auto *OrigFold = dyn_cast<CXXFoldExpr>(IDC))
     NewIDC = new (C) CXXFoldExpr(
         OrigFold->getType(), /*Callee*/ nullptr, SourceLocation(), NewIDC,
         BinaryOperatorKind::BO_LAnd, SourceLocation(), /*RHS=*/nullptr,
         SourceLocation(), /*NumExpansions=*/std::nullopt);
   return NewIDC;
 }

clang/lib/AST/ExprConcepts.cpp

ConceptSpecializationExpr *ConceptSpecializationExpr::Create(
     const ConstraintSatisfaction *Satisfaction) {
   return new (C) ConceptSpecializationExpr(
       C, NNS, TemplateKWLoc, ConceptNameInfo, FoundDecl, NamedConcept,
       ArgsAsWritten, SpecDecl, Satisfaction);
 }
 
 ConceptSpecializationExpr::ConceptSpecializationExpr(
     const ASTContext &C, ConceptDecl *NamedConcept,
+    const ASTTemplateArgumentListInfo *ArgsAsWritten,
     ImplicitConceptSpecializationDecl *SpecDecl,
     const ConstraintSatisfaction *Satisfaction, bool Dependent,
     bool ContainsUnexpandedParameterPack)
     : Expr(ConceptSpecializationExprClass, C.BoolTy, VK_PRValue, OK_Ordinary),
       ConceptReference(NestedNameSpecifierLoc(), SourceLocation(),
                        DeclarationNameInfo(), NamedConcept, NamedConcept,
-                       nullptr),
+                       ArgsAsWritten),
       SpecDecl(SpecDecl),
       Satisfaction(Satisfaction
                        ? ASTConstraintSatisfaction::Create(C, *Satisfaction)
                        : nullptr) {
   ExprDependence D = ExprDependence::None;
   if (!Satisfaction)
     D |= ExprDependence::Value;
   if (Dependent)
     D |= ExprDependence::Instantiation;
   if (ContainsUnexpandedParameterPack)
     D |= ExprDependence::UnexpandedPack;
   setDependence(D);
 }
 
 ConceptSpecializationExpr *ConceptSpecializationExpr::Create(
     const ASTContext &C, ConceptDecl *NamedConcept,
+    const ASTTemplateArgumentListInfo *ArgsAsWritten,
     ImplicitConceptSpecializationDecl *SpecDecl,
     const ConstraintSatisfaction *Satisfaction, bool Dependent,
     bool ContainsUnexpandedParameterPack) {
-  return new (C)
-      ConceptSpecializationExpr(C, NamedConcept, SpecDecl, Satisfaction,
-                                Dependent, ContainsUnexpandedParameterPack);
+  return new (C) ConceptSpecializationExpr(C, NamedConcept, ArgsAsWritten,
+                                           SpecDecl, Satisfaction, Dependent,
+                                           ContainsUnexpandedParameterPack);
 }
 
 const TypeConstraint *
 concepts::ExprRequirement::ReturnTypeRequirement::getTypeConstraint() const {
   assert(isTypeConstraint());
   auto TPL =
       TypeConstraintInfo.getPointer().get<TemplateParameterList *>();
   return cast<TemplateTypeParmDecl>(TPL->getParam(0))

clang/test/PCH/cxx2a-constraints.cpp

 template <SizedLike<int> T> void h(T) {}
 template <SizedLike<char> T> void h(T) {}
 
 template <SizedLike<int> T> void i(T) {}
 template <SizedLike T> void i(T) {}
 
 void j(SizedLike<int> auto ...ints) {}
 
+template<template<SizedLike> class P> struct S1 { };
+
 #else /*included pch*/
 
 int main() {
   (void)f('1');
   (void)f(1);
   (void)g('1');
   (void)g(1);
   (void)h('1');
   (void)h(1);
   (void)i('1');
   (void)i(1);
   (void)j(1, 2, 3);
 }
 
 #endif // HEADER