[TSan] s/internal_memset/real_memset

llvm-svn: 158200

6 files changed, 10 insertions, 10 deletions

diff --git a/compiler-rt/lib/tsan/rtl/tsan_defs.h b/compiler-rt/lib/tsan/rtl/tsan_defs.h
index a344af29a79..5a873d86d02 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_defs.h
+++ b/compiler-rt/lib/tsan/rtl/tsan_defs.h
@@ -134,7 +134,7 @@ T RoundUp(T p, int align) {
   return (T)(((u64)p + align - 1) & ~(align - 1));
 }
 
-void internal_memset(void *ptr, int c, uptr size);
+void real_memset(void *ptr, int c, uptr size);
 int internal_memcmp(const void *s1, const void *s2, uptr size);
 int internal_strncmp(const char *s1, const char *s2, uptr size);
 void internal_strcpy(char *s1, const char *s2);
diff --git a/compiler-rt/lib/tsan/rtl/tsan_flags.cc b/compiler-rt/lib/tsan/rtl/tsan_flags.cc
index 7224f4b6723..afad9bb766b 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_flags.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_flags.cc
@@ -32,7 +32,7 @@ void WEAK OverrideFlags(Flags *f) {
 }
 
 void InitializeFlags(Flags *f, const char *env) {
-  internal_memset(f, 0, sizeof(*f));
+  real_memset(f, 0, sizeof(*f));
 
   // Default values.
   f->enable_annotations = true;
diff --git a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
index 0c50c25c59f..95ac1041c2b 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
@@ -287,7 +287,7 @@ TSAN_INTERCEPTOR(void*, calloc, uptr size, uptr n) {
   {
     SCOPED_INTERCEPTOR_RAW(calloc, size, n);
     p = user_alloc(thr, pc, n * size);
-    internal_memset(p, 0, n * size);
+    real_memset(p, 0, n * size);
   }
   invoke_malloc_hook(p, n * size);
   return p;
@@ -1283,7 +1283,7 @@ TSAN_INTERCEPTOR(int, sigaction, int sig, sigaction_t *act, sigaction_t *old) {
 TSAN_INTERCEPTOR(sighandler_t, signal, int sig, sighandler_t h) {
   sigaction_t act = {};
   act.sa_handler = h;
-  internal_memset(&act.sa_mask, -1, sizeof(act.sa_mask));
+  real_memset(&act.sa_mask, -1, sizeof(act.sa_mask));
   act.sa_flags = 0;
   sigaction_t old = {};
   int res = sigaction(sig, &act, &old);
@@ -1521,7 +1521,7 @@ void InitializeInterceptors() {
   }
 }
 
-void internal_memset(void *ptr, int c, uptr size) {
+void real_memset(void *ptr, int c, uptr size) {
   REAL(memset)(ptr, c, size);
 }
 
diff --git a/compiler-rt/lib/tsan/rtl/tsan_md5.cc b/compiler-rt/lib/tsan/rtl/tsan_md5.cc
index c9d671f5b59..aeae302df6e 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_md5.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_md5.cc
@@ -194,13 +194,13 @@ void MD5_Final(unsigned char *result, MD5_CTX *ctx) {
   free = 64 - used;
 
   if (free < 8) {
-    internal_memset(&ctx->buffer[used], 0, free);
+    real_memset(&ctx->buffer[used], 0, free);
     body(ctx, ctx->buffer, 64);
     used = 0;
     free = 64;
   }
 
-  internal_memset(&ctx->buffer[used], 0, free - 8);
+  real_memset(&ctx->buffer[used], 0, free - 8);
 
   ctx->lo <<= 3;
   ctx->buffer[56] = ctx->lo;
@@ -231,7 +231,7 @@ void MD5_Final(unsigned char *result, MD5_CTX *ctx) {
   result[14] = ctx->d >> 16;
   result[15] = ctx->d >> 24;
 
-  internal_memset(ctx, 0, sizeof(*ctx));
+  real_memset(ctx, 0, sizeof(*ctx));
 }
 
 MD5Hash md5_hash(const void *data, uptr size) {
diff --git a/compiler-rt/lib/tsan/rtl/tsan_symbolize_addr2line_linux.cc b/compiler-rt/lib/tsan/rtl/tsan_symbolize_addr2line_linux.cc
index 14fb17dff90..71ba7cd86a7 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_symbolize_addr2line_linux.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_symbolize_addr2line_linux.cc
@@ -147,7 +147,7 @@ static SectionDesc *GetSectionDesc(uptr addr) {
 static ReportStack *NewFrame(uptr addr) {
   ReportStack *ent = (ReportStack*)internal_alloc(MBlockReportStack,
                                                   sizeof(ReportStack));
-  internal_memset(ent, 0, sizeof(*ent));
+  real_memset(ent, 0, sizeof(*ent));
   ent->pc = addr;
   return ent;
 }
diff --git a/compiler-rt/lib/tsan/unit_tests/tsan_platform_test.cc b/compiler-rt/lib/tsan/unit_tests/tsan_platform_test.cc
index 64c4499fbea..0d815f6dab4 100644
--- a/compiler-rt/lib/tsan/unit_tests/tsan_platform_test.cc
+++ b/compiler-rt/lib/tsan/unit_tests/tsan_platform_test.cc
@@ -79,7 +79,7 @@ TEST(Platform, FileOps) {
   EXPECT_EQ(len1, internal_read(fd, buf, len1));
   EXPECT_EQ(0, internal_memcmp(buf, str1, len1));
   EXPECT_EQ((char)0, buf[len1 + 1]);
-  internal_memset(buf, 0, len1);
+  real_memset(buf, 0, len1);
   EXPECT_EQ(len2, internal_read(fd, buf, len2));
   EXPECT_EQ(0, internal_memcmp(buf, str2, len2));
   internal_close(fd);