[Sanitizer] Use internal_memmove instead of the one implicitly generated by compiler.

llvm-svn: 246198

1 files changed, 3 insertions, 2 deletions

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common.cc b/compiler-rt/lib/sanitizer_common/sanitizer_common.cc
index 4ffa5b8be48..013952c0ad6 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common.cc
@@ -121,8 +121,9 @@ bool AddDieCallback(DieCallbackType callback) {
 bool RemoveDieCallback(DieCallbackType callback) {
   for (int i = 0; i < kMaxNumOfInternalDieCallbacks; i++) {
     if (InternalDieCallbacks[i] == callback) {
-      for (int j = i + 1; j < kMaxNumOfInternalDieCallbacks; j++)
-        InternalDieCallbacks[j - 1] = InternalDieCallbacks[j];
+      internal_memmove(&InternalDieCallbacks[i], &InternalDieCallbacks[i + 1],
+                       sizeof(InternalDieCallbacks[0]) *
+                           (kMaxNumOfInternalDieCallbacks - i - 1));
       InternalDieCallbacks[kMaxNumOfInternalDieCallbacks - 1] = nullptr;
       return true;
     }