[analyzer] Hopefully fix the ARM buildbot.

llvm-svn: 328913

2 files changed, 9 insertions, 10 deletions

diff --git a/clang/test/Analysis/bstring.c b/clang/test/Analysis/bstring.c
index a671d9ee8d4..89a77cdff86 100644
--- a/clang/test/Analysis/bstring.c
+++ b/clang/test/Analysis/bstring.c
@@ -474,3 +474,12 @@ char radar_11125445_memcopythenlogfirstbyte(const char *input, size_t length) {
   free(bytes);
   return x;
 }
+
+struct S {
+  char f;
+};
+
+void nocrash_on_locint_offset(void *addr, void* from, struct S s) {
+  int iAdd = (int) addr;
+  memcpy(((void *) &(s.f)), from, iAdd);
+}
diff --git a/clang/test/Analysis/string.c b/clang/test/Analysis/string.c
index 5bfa31e732d..e4a7482f72c 100644
--- a/clang/test/Analysis/string.c
+++ b/clang/test/Analysis/string.c
@@ -30,7 +30,6 @@ typedef typeof(sizeof(int)) size_t;
 void clang_analyzer_eval(int);
 
 int scanf(const char *restrict format, ...);
-void *memcpy(void *, const void *, unsigned long);
 
 //===----------------------------------------------------------------------===
 // strlen()
@@ -1187,12 +1186,3 @@ void strncpy_exactly_matching_buffer2(char *y) {
 	// This time, we know that y fits in x anyway.
   clang_analyzer_eval(strlen(x) <= 3); // expected-warning{{UNKNOWN}}
 }
-
-struct S {
-  char f;
-};
-
-void nocrash_on_locint_offset(void *addr, void* from, struct S s) {
-  int iAdd = (int) addr;
-  memcpy(((void *) &(s.f)), from, iAdd);
-}