diff options
| -rw-r--r-- | lib/Sema/SemaTemplateDeduction.cpp | 10 | ||||
| -rw-r--r-- | test/SemaObjCXX/arc-templates.mm | 17 |
2 files changed, 27 insertions, 0 deletions
diff --git a/lib/Sema/SemaTemplateDeduction.cpp b/lib/Sema/SemaTemplateDeduction.cpp index dcf878115e..9500ec3219 100644 --- a/lib/Sema/SemaTemplateDeduction.cpp +++ b/lib/Sema/SemaTemplateDeduction.cpp @@ -2436,6 +2436,16 @@ CheckOriginalCallArgDeduction(Sema &S, Sema::OriginalCallArg OriginalArg, Qualifiers AQuals = A.getQualifiers(); Qualifiers DeducedAQuals = DeducedA.getQualifiers(); + + // Under Objective-C++ ARC, the deduced type may have implicitly been + // given strong lifetime. If so, update the original qualifiers to + // include this strong lifetime. + if (S.getLangOpts().ObjCAutoRefCount && + DeducedAQuals.getObjCLifetime() == Qualifiers::OCL_Strong && + AQuals.getObjCLifetime() == Qualifiers::OCL_None) { + AQuals.setObjCLifetime(Qualifiers::OCL_Strong); + } + if (AQuals == DeducedAQuals) { // Qualifiers match; there's nothing to do. } else if (!DeducedAQuals.compatiblyIncludes(AQuals)) { diff --git a/test/SemaObjCXX/arc-templates.mm b/test/SemaObjCXX/arc-templates.mm index 9eca84648f..80092729d3 100644 --- a/test/SemaObjCXX/arc-templates.mm +++ b/test/SemaObjCXX/arc-templates.mm @@ -3,6 +3,8 @@ @interface A @end +@class NSString; + template<typename T, typename U> struct is_same { static const bool value = false; @@ -266,3 +268,18 @@ namespace rdar9828157 { float &fr = (f)(ap); } } + +namespace rdar10862386 { + // More deduction with lifetime qualifiers. + template <typename T> + int testing(const T &) { + return 1; + } + + void test() { + testing(1); + testing("hi"); + testing<NSString *>(@"hi"); + testing(@"hi"); + } +} |