<div dir="ltr">Should this get merged for the next release?</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Aug 13, 2014 at 5:49 PM, David Majnemer <span dir="ltr"><<a href="mailto:david.majnemer@gmail.com" target="_blank">david.majnemer@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Wed Aug 13 19:49:23 2014<br>
New Revision: 215609<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=215609&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=215609&view=rev</a><br>
Log:<br>
Sema: Permit nullptr template args in MSVC compat mode<br>
<br>
This fixes a regression I caused back in r211766.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Sema/SemaTemplate.cpp<br>
    cfe/trunk/test/Parser/MicrosoftExtensions.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=215609&r1=215608&r2=215609&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=215609&r1=215608&r2=215609&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaTemplate.cpp Wed Aug 13 19:49:23 2014<br>
@@ -4189,7 +4189,7 @@ isNullPointerValueTemplateArgument(Sema<br>
   if (Arg->isValueDependent() || Arg->isTypeDependent())<br>
     return NPV_NotNullPointer;<br>
<br>
-  if (!S.getLangOpts().CPlusPlus11 || S.getLangOpts().MSVCCompat)<br>
+  if (!S.getLangOpts().CPlusPlus11)<br>
     return NPV_NotNullPointer;<br>
<br>
   // Determine whether we have a constant expression.<br>
<br>
Modified: cfe/trunk/test/Parser/MicrosoftExtensions.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/MicrosoftExtensions.cpp?rev=215609&r1=215608&r2=215609&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/MicrosoftExtensions.cpp?rev=215609&r1=215608&r2=215609&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/test/Parser/MicrosoftExtensions.cpp (original)<br>
+++ cfe/trunk/test/Parser/MicrosoftExtensions.cpp Wed Aug 13 19:49:23 2014<br>
@@ -118,7 +118,7 @@ typedef COM_CLASS_TEMPLATE_REF<struct_wi<br>
<br>
 COM_CLASS_TEMPLATE_REF<int, __uuidof(struct_with_uuid)> good_template_arg;<br>
<br>
-COM_CLASS_TEMPLATE<int, __uuidof(struct_with_uuid)> bad_template_arg; // expected-error {{non-type template argument of type 'const _GUID' cannot be converted to a value of type 'const GUID *' (aka 'const _GUID *')}}<br>

+COM_CLASS_TEMPLATE<int, __uuidof(struct_with_uuid)> bad_template_arg; // expected-error {{non-type template argument of type 'const _GUID' is not a constant expression}}<br>
<br>
 namespace PR16911 {<br>
 struct __declspec(uuid("{12345678-1234-1234-1234-1234567890aB}")) uuid;<br>
@@ -357,3 +357,7 @@ void *_alloca(int);<br>
 void foo(void) {<br>
   __declspec(align(16)) int *buffer = (int *)_alloca(9);<br>
 }<br>
+<br>
+template <int *><br>
+struct NullptrArg {};<br>
+NullptrArg<nullptr> a;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>