diff options
| -rw-r--r-- | lib/Sema/SemaTemplateDeduction.cpp | 7 | ||||
| -rw-r--r-- | test/SemaTemplate/derived.cpp | 12 |
2 files changed, 18 insertions, 1 deletions
diff --git a/lib/Sema/SemaTemplateDeduction.cpp b/lib/Sema/SemaTemplateDeduction.cpp index 98e22c0b65..bf4533d699 100644 --- a/lib/Sema/SemaTemplateDeduction.cpp +++ b/lib/Sema/SemaTemplateDeduction.cpp @@ -1393,9 +1393,11 @@ DeduceTemplateArgumentsByTypeMatch(Sema &S, // If this is a base class, try to perform template argument // deduction from it. if (NextT != RecordT) { + TemplateDeductionInfo BaseInfo(Info.getLocation()); Sema::TemplateDeductionResult BaseResult = DeduceTemplateArguments(S, TemplateParams, SpecParam, - QualType(NextT, 0), Info, Deduced); + QualType(NextT, 0), BaseInfo, + Deduced); // If template argument deduction for this base was successful, // note that we had some success. Otherwise, ignore any deductions @@ -1404,6 +1406,9 @@ DeduceTemplateArgumentsByTypeMatch(Sema &S, Successful = true; DeducedOrig.clear(); DeducedOrig.append(Deduced.begin(), Deduced.end()); + Info.Param = BaseInfo.Param; + Info.FirstArg = BaseInfo.FirstArg; + Info.SecondArg = BaseInfo.SecondArg; } else Deduced = DeducedOrig; diff --git a/test/SemaTemplate/derived.cpp b/test/SemaTemplate/derived.cpp new file mode 100644 index 0000000000..1fb9401c94 --- /dev/null +++ b/test/SemaTemplate/derived.cpp @@ -0,0 +1,12 @@ +// RUN: %clang_cc1 -fsyntax-only -verify %s + +template<typename T> class vector2 {}; +template<typename T> class vector : vector2<T> {}; + +template<typename T> void Foo2(vector2<const T*> V) {} // expected-note{{candidate template ignored: can't deduce a type for 'T' which would make 'const T' equal 'int'}} +template<typename T> void Foo(vector<const T*> V) {} // expected-note {{candidate template ignored: can't deduce a type for 'T' which would make 'const T' equal 'int'}} + +void test() { + Foo2(vector2<int*>()); // expected-error{{no matching function for call to 'Foo2'}} + Foo(vector<int*>()); // expected-error{{no matching function for call to 'Foo'}} +} |