Commit 4c7a06eb authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r215609: 

------------------------------------------------------------------------
r215609 | majnemer | 2014-08-13 17:49:23 -0700 (Wed, 13 Aug 2014) | 3 lines

Sema: Permit nullptr template args in MSVC compat mode

This fixes a regression I caused back in r211766.
------------------------------------------------------------------------

llvm-svn: 215881
parent 61c4ba94

clang/lib/Sema/SemaTemplate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4189,7 +4189,7 @@ isNullPointerValueTemplateArgument(Sema &S, NonTypeTemplateParmDecl *Param, 
  if (Arg->isValueDependent() || Arg->isTypeDependent())

    return NPV_NotNullPointer;

  

  if (!S.getLangOpts().CPlusPlus11 || S.getLangOpts().MSVCCompat)

  if (!S.getLangOpts().CPlusPlus11)

    return NPV_NotNullPointer;

  

  // Determine whether we have a constant expression.

clang/test/Parser/MicrosoftExtensions.cpp

+5 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ typedef COM_CLASS_TEMPLATE_REF<struct_with_uuid, __uuidof(struct_with_uuid)> COM 


COM_CLASS_TEMPLATE_REF<int, __uuidof(struct_with_uuid)> good_template_arg;



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 *')}}

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}}



namespace PR16911 {

struct __declspec(uuid("{12345678-1234-1234-1234-1234567890aB}")) uuid;
@@ -357,3 +357,7 @@ void *_alloca(int); 
void foo(void) {

  __declspec(align(16)) int *buffer = (int *)_alloca(9);

}



template <int *>

struct NullptrArg {};

NullptrArg<nullptr> a;