================
@@ -10616,6 +10616,43 @@ bool clang::isBetterOverloadCandidate(
auto *Guide1 = dyn_cast_or_null<CXXDeductionGuideDecl>(Cand1.Function);
auto *Guide2 = dyn_cast_or_null<CXXDeductionGuideDecl>(Cand2.Function);
if (Guide1 && Guide2) {
+ // -- F1 and F2 are generated from class template argument deduction
+ // for a class D, and F2 is generated from inheriting constructors
+ // from a base class of D while F1 is not, ...
+ bool G1Inherited =
+ Guide1->getSourceDeductionGuide() &&
+ Guide1->getSourceKind() ==
+ CXXDeductionGuideDecl::SourceKind::InheritedConstructor;
+ bool G2Inherited =
+ Guide2->getSourceDeductionGuide() &&
+ Guide2->getSourceKind() ==
+ CXXDeductionGuideDecl::SourceKind::InheritedConstructor;
+ if (Guide1->isImplicit() && Guide2->isImplicit() &&
+ G1Inherited != G2Inherited) {
+ const FunctionProtoType *FPT1 =
+ Guide1->getType()->getAs<FunctionProtoType>();
+ const FunctionProtoType *FPT2 =
+ Guide2->getType()->getAs<FunctionProtoType>();
+ assert(FPT1 && FPT2);
+
+ // ... and for each explicit function argument, the parameters of F1
and
+ // F2 are either both ellipses or have the same type
+ if (FPT1->isVariadic() == FPT2->isVariadic() &&
+ FPT1->getNumParams() == FPT2->getNumParams()) {
+ const auto &P1 = FPT1->getParamTypes();
+ const auto &P2 = FPT2->getParamTypes();
+ bool ParamsHaveSameType = llvm::all_of(
+ llvm::zip(P1, P2),
----------------
antangelo wrote:
I've updated this to use `all_of_zip`
https://github.com/llvm/llvm-project/pull/98788
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
