From: David Majnemer <david.majnemer@gmail.com>
Date: Fri, 11 Sep 2015 20:55:29 +0000 (+0000)
Subject: Simplify logic introduced in r247464.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82c98a0a55f9444d62797d90e550f8559d5c4282;p=clang

Simplify logic introduced in r247464.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@247472 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index d658f7b470..22625527f5 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -4223,9 +4223,9 @@ isNullPointerValueTemplateArgument(Sema &S, NonTypeTemplateParmDecl *Param,
   if (Arg->isValueDependent() || Arg->isTypeDependent())
     return NPV_NotNullPointer;
 
-  if (ParamType->isMemberPointerType())
-    if (S.Context.getTargetInfo().getCXXABI().isMicrosoft())
-      S.RequireCompleteType(Arg->getExprLoc(), ParamType, 0);
+  if (S.RequireCompleteType(Arg->getExprLoc(), ParamType, 0))
+    llvm_unreachable(
+        "Incomplete parameter type in isNullPointerValueTemplateArgument!");
 
   if (!S.getLangOpts().CPlusPlus11)
     return NPV_NotNullPointer;