Convert assertion in memset checking to a runtime check (because real code may provide a deviant definition of memset).

llvm-svn: 130368

2 files changed, 12 insertions, 1 deletions

diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index 7ee0eac370b..f616a10524e 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -1804,7 +1804,12 @@ void Sema::CheckFormatString(const StringLiteral *FExpr,
 ///
 /// \param Call The call expression to diagnose.
 void Sema::CheckMemsetArguments(const CallExpr *Call) {
-  assert(Call->getNumArgs() == 3 && "Unexpected number of arguments to memset");
+  // It is possible to have a non-standard definition of memset.  Validate
+  // we have the proper number of arguments, and if not, abort further
+  // checking.
+  if (Call->getNumArgs() != 3)
+    return;
+
   const Expr *Dest = Call->getArg(0)->IgnoreParenImpCasts();
 
   QualType DestTy = Dest->getType();
diff --git a/clang/test/Sema/memset-invalid.c b/clang/test/Sema/memset-invalid.c
new file mode 100644
index 00000000000..c763858e26e
--- /dev/null
+++ b/clang/test/Sema/memset-invalid.c
@@ -0,0 +1,6 @@
+// RUN: %clang_cc1 -fsyntax-only %s -verify
+
+char memset(); // expected-warning {{incompatible redeclaration of library function 'memset'}} expected-note{{'memset' is a builtin with type}}
+char test() {
+  return memset();
+}