Merge "android_memset.c: Use __attribute__((no_sanitize("integer")))"

This commit is contained in:
Nick Kralevich 2015-08-27 20:36:08 +00:00 committed by Gerrit Code Review
commit e6d3cf3937

View file

@ -30,6 +30,9 @@
#include <cutils/memory.h> #include <cutils/memory.h>
#ifdef __clang__
__attribute__((no_sanitize("integer")))
#endif
void android_memset16(uint16_t* dst, uint16_t value, size_t size) void android_memset16(uint16_t* dst, uint16_t value, size_t size)
{ {
/* optimized version of /* optimized version of
@ -54,6 +57,9 @@ void android_memset16(uint16_t* dst, uint16_t value, size_t size)
} }
#ifdef __clang__
__attribute__((no_sanitize("integer")))
#endif
void android_memset32(uint32_t* dst, uint32_t value, size_t size) void android_memset32(uint32_t* dst, uint32_t value, size_t size)
{ {
/* optimized version of /* optimized version of
@ -86,7 +92,8 @@ void android_memset32(uint32_t* dst, uint32_t value, size_t size)
/* fill remainder with original 32-bit single-elem loop */ /* fill remainder with original 32-bit single-elem loop */
dst = (uint32_t*) dst64; dst = (uint32_t*) dst64;
while (size--) { while (size != 0) {
size--;
*dst++ = value; *dst++ = value;
} }