<div dir="ltr">You forgot to update test/CXX/drs/dr5xx.cpp. Updated in r254346.</div><br><div class="gmail_quote"><div dir="ltr">On Tue, Dec 1, 2015 at 5:37 AM David Majnemer via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Mon Nov 30 14:34:28 2015<br>
New Revision: 254323<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=254323&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=254323&view=rev</a><br>
Log:<br>
[MS Compat] Adjust thiscall to cdecl when deducing template arguments<br>
<br>
Function types can be extracted from member pointer types.<br>
However, the type is not appropriate without first adjusting the calling<br>
convention.<br>
<br>
This fixes PR25661.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp<br>
    cfe/trunk/test/SemaCXX/calling-conv-compat.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp?rev=254323&r1=254322&r2=254323&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp?rev=254323&r1=254322&r2=254323&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp Mon Nov 30 14:34:28 2015<br>
@@ -1517,10 +1517,19 @@ DeduceTemplateArgumentsByTypeMatch(Sema<br>
       if (!MemPtrArg)<br>
         return Sema::TDK_NonDeducedMismatch;<br>
<br>
+      QualType ParamPointeeType = MemPtrParam->getPointeeType();<br>
+      if (ParamPointeeType->isFunctionType())<br>
+        S.adjustMemberFunctionCC(ParamPointeeType, /*IsStatic=*/true,<br>
+                                 /*IsCtorOrDtor=*/false, Info.getLocation());<br>
+      QualType ArgPointeeType = MemPtrArg->getPointeeType();<br>
+      if (ArgPointeeType->isFunctionType())<br>
+        S.adjustMemberFunctionCC(ArgPointeeType, /*IsStatic=*/true,<br>
+                                 /*IsCtorOrDtor=*/false, Info.getLocation());<br>
+<br>
       if (Sema::TemplateDeductionResult Result<br>
             = DeduceTemplateArgumentsByTypeMatch(S, TemplateParams,<br>
-                                                 MemPtrParam->getPointeeType(),<br>
-                                                 MemPtrArg->getPointeeType(),<br>
+                                                 ParamPointeeType,<br>
+                                                 ArgPointeeType,<br>
                                                  Info, Deduced,<br>
                                                  TDF & TDF_IgnoreQualifiers))<br>
         return Result;<br>
<br>
Modified: cfe/trunk/test/SemaCXX/calling-conv-compat.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/calling-conv-compat.cpp?rev=254323&r1=254322&r2=254323&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/calling-conv-compat.cpp?rev=254323&r1=254322&r2=254323&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaCXX/calling-conv-compat.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/calling-conv-compat.cpp Mon Nov 30 14:34:28 2015<br>
@@ -370,6 +370,19 @@ X<fun_cdecl   >::p tmpl6 = &A::method_th<br>
 X<fun_stdcall >::p tmpl7 = &A::method_stdcall;<br>
 X<fun_fastcall>::p tmpl8 = &A::method_fastcall;<br>
<br>
+// Make sure we adjust thiscall to cdecl when extracting the function type from<br>
+// a member pointer.<br>
+template <typename> struct Y;<br>
+<br>
+template <typename Fn, typename C><br>
+struct Y<Fn C::*> {<br>
+  typedef Fn *p;<br>
+};<br>
+<br>
+void __cdecl f_cdecl();<br>
+Y<decltype(&A::method_thiscall)>::p tmpl9 = &f_cdecl;<br>
+<br>
+<br>
 } // end namespace MemberPointers<br>
<br>
 // Test that lambdas that capture nothing convert to cdecl function pointers.<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>