@@ -6857,10 +6857,7 @@ void Sema::AddOverloadCandidate(
6857
6857
Candidate.Viable = true;
6858
6858
Candidate.RewriteKind =
6859
6859
CandidateSet.getRewriteInfo().getRewriteKind(Function, PO);
6860
- Candidate.IsSurrogate = false;
6861
6860
Candidate.IsADLCandidate = IsADLCandidate;
6862
- Candidate.IgnoreObjectArgument = false;
6863
- Candidate.TookAddressOfOverload = false;
6864
6861
Candidate.ExplicitCallArguments = Args.size();
6865
6862
6866
6863
// Explicit functions are not actually candidates at all if we're not
@@ -7422,8 +7419,6 @@ Sema::AddMethodCandidate(CXXMethodDecl *Method, DeclAccessPair FoundDecl,
7422
7419
Candidate.Function = Method;
7423
7420
Candidate.RewriteKind =
7424
7421
CandidateSet.getRewriteInfo().getRewriteKind(Method, PO);
7425
- Candidate.IsSurrogate = false;
7426
- Candidate.IgnoreObjectArgument = false;
7427
7422
Candidate.TookAddressOfOverload =
7428
7423
CandidateSet.getKind() == OverloadCandidateSet::CSK_AddressOfOverloadSet;
7429
7424
Candidate.ExplicitCallArguments = Args.size();
@@ -7617,7 +7612,6 @@ void Sema::AddMethodTemplateCandidate(
7617
7612
Candidate.IgnoreObjectArgument =
7618
7613
cast<CXXMethodDecl>(Candidate.Function)->isStatic() ||
7619
7614
ObjectType.isNull();
7620
- Candidate.TookAddressOfOverload = false;
7621
7615
Candidate.ExplicitCallArguments = Args.size();
7622
7616
if (Result == TemplateDeductionResult::NonDependentConversionFailure)
7623
7617
Candidate.FailureKind = ovl_fail_bad_conversion;
@@ -7705,7 +7699,6 @@ void Sema::AddTemplateOverloadCandidate(
7705
7699
Candidate.IgnoreObjectArgument =
7706
7700
isa<CXXMethodDecl>(Candidate.Function) &&
7707
7701
!isa<CXXConstructorDecl>(Candidate.Function);
7708
- Candidate.TookAddressOfOverload = false;
7709
7702
Candidate.ExplicitCallArguments = Args.size();
7710
7703
if (Result == TemplateDeductionResult::NonDependentConversionFailure)
7711
7704
Candidate.FailureKind = ovl_fail_bad_conversion;
@@ -7886,9 +7879,6 @@ void Sema::AddConversionCandidate(
7886
7879
OverloadCandidate &Candidate = CandidateSet.addCandidate(1);
7887
7880
Candidate.FoundDecl = FoundDecl;
7888
7881
Candidate.Function = Conversion;
7889
- Candidate.IsSurrogate = false;
7890
- Candidate.IgnoreObjectArgument = false;
7891
- Candidate.TookAddressOfOverload = false;
7892
7882
Candidate.FinalConversion.setAsIdentityConversion();
7893
7883
Candidate.FinalConversion.setFromType(ConvType);
7894
7884
Candidate.FinalConversion.setAllToTypes(ToType);
@@ -8084,9 +8074,6 @@ void Sema::AddTemplateConversionCandidate(
8084
8074
Candidate.Function = FunctionTemplate->getTemplatedDecl();
8085
8075
Candidate.Viable = false;
8086
8076
Candidate.FailureKind = ovl_fail_bad_deduction;
8087
- Candidate.IsSurrogate = false;
8088
- Candidate.IgnoreObjectArgument = false;
8089
- Candidate.TookAddressOfOverload = false;
8090
8077
Candidate.ExplicitCallArguments = 1;
8091
8078
Candidate.DeductionFailure = MakeDeductionFailureInfo(Context, Result,
8092
8079
Info);
@@ -8119,10 +8106,8 @@ void Sema::AddSurrogateCandidate(CXXConversionDecl *Conversion,
8119
8106
Candidate.FoundDecl = FoundDecl;
8120
8107
Candidate.Function = nullptr;
8121
8108
Candidate.Surrogate = Conversion;
8122
- Candidate.Viable = true;
8123
8109
Candidate.IsSurrogate = true;
8124
- Candidate.IgnoreObjectArgument = false;
8125
- Candidate.TookAddressOfOverload = false;
8110
+ Candidate.Viable = true;
8126
8111
Candidate.ExplicitCallArguments = Args.size();
8127
8112
8128
8113
// Determine the implicit conversion sequence for the implicit
@@ -8328,9 +8313,6 @@ void Sema::AddBuiltinCandidate(QualType *ParamTys, ArrayRef<Expr *> Args,
8328
8313
OverloadCandidate &Candidate = CandidateSet.addCandidate(Args.size());
8329
8314
Candidate.FoundDecl = DeclAccessPair::make(nullptr, AS_none);
8330
8315
Candidate.Function = nullptr;
8331
- Candidate.IsSurrogate = false;
8332
- Candidate.IgnoreObjectArgument = false;
8333
- Candidate.TookAddressOfOverload = false;
8334
8316
std::copy(ParamTys, ParamTys + Args.size(), Candidate.BuiltinParamTypes);
8335
8317
8336
8318
// Determine the implicit conversion sequences for each of the
0 commit comments