Merge "Use ELF notes to set the desired memory tagging level."
diff --git a/libc/bionic/malloc_tagged_pointers.h b/libc/bionic/malloc_tagged_pointers.h
index de3cc2e..484a080 100644
--- a/libc/bionic/malloc_tagged_pointers.h
+++ b/libc/bionic/malloc_tagged_pointers.h
@@ -99,9 +99,10 @@
// check below allows us to turn *off* pointer tagging (by setting PointerCheckMask() and
// FixedPointerTag() to zero) and still allow tagged heap allocations to be freed.
if ((ptr_int & PointerCheckMask()) != FixedPointerTag()) {
- // TODO(b/145604058) - Upstream tagged pointers documentation and provide
- // a link to it in the abort message here.
- async_safe_fatal("Pointer tag for %p was truncated.", ptr);
+ async_safe_fatal(
+ "Pointer tag for %p was truncated, see "
+ "'https://source.android.com/devices/tech/debug/tagged-pointers'.",
+ ptr);
}
return reinterpret_cast<void*>(ptr_int & PointerUntagMask());
}