diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-11-02 00:02:34 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-11-02 00:02:34 +0000 |
| commit | e0f7a8ace9eb9c1d5f675b10f129267ce8a37f94 (patch) | |
| tree | f0b5c71f277d059b8679e1abc40903f1d4aae239 /clang/lib/Sema/SemaTemplateDeduction.cpp | |
| parent | 5c86d22e672e8e29c62c4a8e08ef2e72f1e513c4 (diff) | |
| download | bcm5719-llvm-e0f7a8ace9eb9c1d5f675b10f129267ce8a37f94.tar.gz bcm5719-llvm-e0f7a8ace9eb9c1d5f675b10f129267ce8a37f94.zip | |
When performing template argument deduction against a template-id,
only keep deduction results for successful deductions, so that they
can be compared against each other. Fixes PR8462, from Richard Smith!
llvm-svn: 117983
Diffstat (limited to 'clang/lib/Sema/SemaTemplateDeduction.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaTemplateDeduction.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaTemplateDeduction.cpp b/clang/lib/Sema/SemaTemplateDeduction.cpp index 855516cf10c..905e17e9c14 100644 --- a/clang/lib/Sema/SemaTemplateDeduction.cpp +++ b/clang/lib/Sema/SemaTemplateDeduction.cpp @@ -721,6 +721,8 @@ DeduceTemplateArguments(Sema &S, llvm::SmallVector<const RecordType *, 8> ToVisit; ToVisit.push_back(RecordT); bool Successful = false; + llvm::SmallVectorImpl<DeducedTemplateArgument> DeducedOrig(0); + DeducedOrig = Deduced; while (!ToVisit.empty()) { // Retrieve the next class in the inheritance hierarchy. const RecordType *NextT = ToVisit.back(); @@ -738,9 +740,14 @@ DeduceTemplateArguments(Sema &S, QualType(NextT, 0), Info, Deduced); // If template argument deduction for this base was successful, - // note that we had some success. - if (BaseResult == Sema::TDK_Success) + // note that we had some success. Otherwise, ignore any deductions + // from this base class. + if (BaseResult == Sema::TDK_Success) { Successful = true; + DeducedOrig = Deduced; + } + else + Deduced = DeducedOrig; } // Visit base classes |
