diff options
| -rw-r--r-- | include/clang/Sema/Overload.h | 9 | ||||
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/include/clang/Sema/Overload.h b/include/clang/Sema/Overload.h index 4e39678fa6..d2fc285c9e 100644 --- a/include/clang/Sema/Overload.h +++ b/include/clang/Sema/Overload.h @@ -753,14 +753,7 @@ namespace clang { public: OverloadCandidateSet(SourceLocation Loc) : Loc(Loc), NumInlineSequences(0){} - ~OverloadCandidateSet() { - for (iterator i = begin(), e = end(); i != e; ++i) { - for (unsigned ii = 0, ie = i->NumConversions; ii != ie; ++ii) - i->Conversions[ii].~ImplicitConversionSequence(); - if (i->FailureKind == ovl_fail_bad_deduction) - i->DeductionFailure.Destroy(); - } - } + ~OverloadCandidateSet() { clear(); } SourceLocation getLocation() const { return Loc; } diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index f045a2b93c..9420b73d8b 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -735,9 +735,12 @@ OverloadCandidate::DeductionFailureInfo::getSecondArg() { } void OverloadCandidateSet::clear() { - for (iterator i = begin(), e = end(); i != e; ++i) + for (iterator i = begin(), e = end(); i != e; ++i) { for (unsigned ii = 0, ie = i->NumConversions; ii != ie; ++ii) i->Conversions[ii].~ImplicitConversionSequence(); + if (!i->Viable && i->FailureKind == ovl_fail_bad_deduction) + i->DeductionFailure.Destroy(); + } NumInlineSequences = 0; Candidates.clear(); Functions.clear(); |