Merge cherrypicks of ['android-review.googlesource.com/3140909'] into 24Q3-release.

Change-Id: I9e1ce0c2a52f2a66408d67138b035bde4eb7fc0d
This commit is contained in:
Android Build Coastguard Worker 2024-06-26 03:12:06 +00:00
commit c5052b4283

View file

@ -184,6 +184,9 @@ bool SetHeapTaggingLevel(HeapTaggingLevel tag_level) {
#ifdef __aarch64__ #ifdef __aarch64__
static inline __attribute__((no_sanitize("memtag"))) void untag_memory(void* from, void* to) { static inline __attribute__((no_sanitize("memtag"))) void untag_memory(void* from, void* to) {
if (from == to) {
return;
}
__asm__ __volatile__( __asm__ __volatile__(
".arch_extension mte\n" ".arch_extension mte\n"
"1:\n" "1:\n"