ChuanqiXu updated this revision to Diff 442055. ChuanqiXu added a comment. Remove unnecessary changes.
CHANGES SINCE LAST ACTION https://reviews.llvm.org/D129068/new/ https://reviews.llvm.org/D129068 Files: clang/lib/AST/ASTContext.cpp clang/test/Modules/concept.cppm Index: clang/test/Modules/concept.cppm =================================================================== --- clang/test/Modules/concept.cppm +++ clang/test/Modules/concept.cppm @@ -18,6 +18,9 @@ template <class _Tp> concept __member_size = requires(_Tp &&t) { t.size(); }; +template <class First, class Second> +concept C = requires(First x, Second y) { x+y; }; + struct A { public: template <Range T> @@ -29,6 +32,11 @@ constexpr __integer_like auto operator()(_Tp&& __t) const { return __t.size(); } + + template <__integer_like _Tp, C<_Tp> Sentinel> + constexpr _Tp operator()(_Tp &&__t, Sentinel &&last) const { + return __t; + } }; #endif @@ -51,4 +59,5 @@ auto operator+(S s) { return 0; } }; __fn{}(S()); + __fn{}(S(), S()); } Index: clang/lib/AST/ASTContext.cpp =================================================================== --- clang/lib/AST/ASTContext.cpp +++ clang/lib/AST/ASTContext.cpp @@ -6245,11 +6245,14 @@ auto *TYTCArgs = TYTC->getTemplateArgsAsWritten(); if (TXTCArgs->NumTemplateArgs != TYTCArgs->NumTemplateArgs) return false; + llvm::FoldingSetNodeID XID, YID; - for (auto &ArgLoc : TXTCArgs->arguments()) - ArgLoc.getArgument().Profile(XID, X->getASTContext()); - for (auto &ArgLoc : TYTCArgs->arguments()) - ArgLoc.getArgument().Profile(YID, Y->getASTContext()); + auto *XConstraint = TXTC->getImmediatelyDeclaredConstraint(); + auto *YConstraint = TYTC->getImmediatelyDeclaredConstraint(); + if (XConstraint) + XConstraint->Profile(XID, *this, /*Canonical=*/true); + if (YConstraint) + YConstraint->Profile(YID, *this, /*Canonical=*/true); if (XID != YID) return false; }
Index: clang/test/Modules/concept.cppm =================================================================== --- clang/test/Modules/concept.cppm +++ clang/test/Modules/concept.cppm @@ -18,6 +18,9 @@ template <class _Tp> concept __member_size = requires(_Tp &&t) { t.size(); }; +template <class First, class Second> +concept C = requires(First x, Second y) { x+y; }; + struct A { public: template <Range T> @@ -29,6 +32,11 @@ constexpr __integer_like auto operator()(_Tp&& __t) const { return __t.size(); } + + template <__integer_like _Tp, C<_Tp> Sentinel> + constexpr _Tp operator()(_Tp &&__t, Sentinel &&last) const { + return __t; + } }; #endif @@ -51,4 +59,5 @@ auto operator+(S s) { return 0; } }; __fn{}(S()); + __fn{}(S(), S()); } Index: clang/lib/AST/ASTContext.cpp =================================================================== --- clang/lib/AST/ASTContext.cpp +++ clang/lib/AST/ASTContext.cpp @@ -6245,11 +6245,14 @@ auto *TYTCArgs = TYTC->getTemplateArgsAsWritten(); if (TXTCArgs->NumTemplateArgs != TYTCArgs->NumTemplateArgs) return false; + llvm::FoldingSetNodeID XID, YID; - for (auto &ArgLoc : TXTCArgs->arguments()) - ArgLoc.getArgument().Profile(XID, X->getASTContext()); - for (auto &ArgLoc : TYTCArgs->arguments()) - ArgLoc.getArgument().Profile(YID, Y->getASTContext()); + auto *XConstraint = TXTC->getImmediatelyDeclaredConstraint(); + auto *YConstraint = TYTC->getImmediatelyDeclaredConstraint(); + if (XConstraint) + XConstraint->Profile(XID, *this, /*Canonical=*/true); + if (YConstraint) + YConstraint->Profile(YID, *this, /*Canonical=*/true); if (XID != YID) return false; }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits