aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Sema/SemaChecking.cpp7
-rw-r--r--test/Sema/memset-invalid.c6
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index 7ee0eac370..f616a10524 100644
--- a/lib/Sema/SemaChecking.cpp
+++ b/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/test/Sema/memset-invalid.c b/test/Sema/memset-invalid.c
new file mode 100644
index 0000000000..c763858e26
--- /dev/null
+++ b/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();
+}