Shorten function name

Author: vitalybuka

compiler-rt/lib/asan/asan_poisoning.cpp

@@ -576,31 +576,13 @@ void __sanitizer_annotate_double_ended_contiguous_container(
   }
 }
 
-// Checks if a buffer [p; q) falls into a single granule.
-static bool WithinOneGranule(uptr p, uptr q) {
-  constexpr uptr granularity = ASAN_SHADOW_GRANULARITY;
-  if (p == q)
-    return true;
-  return RoundDownTo(p, granularity) == RoundDownTo(q - 1, granularity);
-}
-
-// Copies ASan memory annotation (a shadow memory value)
-// from one granule to another.
-static void CopyGranuleAnnotation(uptr dst, uptr src) {
-  *(u8 *)MemToShadow(dst) = *(u8 *)MemToShadow(src);
-}
 
 // Marks the specified number of bytes in a granule as accessible or
 // poisones the whole granule with kAsanContiguousContainerOOBMagic value.
-static void AnnotateContainerGranuleAccessibleBytes(uptr ptr, u8 n) {
+static void SetContainerGranule(uptr ptr, u8 n) {
   constexpr uptr granularity = ASAN_SHADOW_GRANULARITY;
-  if (n == granularity) {
-    *(u8 *)MemToShadow(ptr) = 0;
-  } else if (n == 0) {
-    *(u8 *)MemToShadow(ptr) = static_cast<u8>(kAsanContiguousContainerOOBMagic);
-  } else {
-    *(u8 *)MemToShadow(ptr) = n;
-  }
+  u8 s = (n == granularity) ? 0 : (n ? n : kAsanContiguousContainerOOBMagic);
+  *(u8 *)MemToShadow(ptr) = s;
 }
 
 // Performs a byte-by-byte copy of ASan annotations (shadow memory values).
@@ -629,11 +611,9 @@ static void SlowCopyContainerAnnotations(uptr src_storage_beg,
     if (dst_ptr < dst_storage_end || dst_ptr == dst_internal_end ||
         AddressIsPoisoned(dst_storage_end)) {
       if (unpoisoned_bytes != 0 || granule_begin >= dst_storage_beg) {
-        AnnotateContainerGranuleAccessibleBytes(granule_begin,
-                                                unpoisoned_bytes);
+        SetContainerGranule(granule_begin, unpoisoned_bytes);
       } else if (!AddressIsPoisoned(dst_storage_beg)) {
-        AnnotateContainerGranuleAccessibleBytes(
-            granule_begin, dst_storage_beg - granule_begin);
+        SetContainerGranule(granule_begin, dst_storage_beg - granule_begin);
       }
     }
   }
@@ -669,10 +649,9 @@ static void SlowReversedCopyContainerAnnotations(uptr src_storage_beg,
     }
 
     if (granule_begin == dst_ptr || unpoisoned_bytes != 0) {
-      AnnotateContainerGranuleAccessibleBytes(granule_begin, unpoisoned_bytes);
+      SetContainerGranule(granule_begin, unpoisoned_bytes);
     } else if (!AddressIsPoisoned(dst_storage_beg)) {
-      AnnotateContainerGranuleAccessibleBytes(granule_begin,
-                                              dst_storage_beg - granule_begin);
+      SetContainerGranule(granule_begin, dst_storage_beg - granule_begin);
     }
   }
 }
@@ -687,10 +666,11 @@ static void CopyContainerFirstGranuleAnnotation(uptr src_storage_begin,
   uptr dst_external_begin = RoundDownTo(dst_storage_begin, granularity);
   uptr src_external_begin = RoundDownTo(src_storage_begin, granularity);
   if (!AddressIsPoisoned(src_storage_begin)) {
-    CopyGranuleAnnotation(dst_external_begin, src_external_begin);
+    *(u8 *)MemToShadow(dst_external_begin) =
+        *(u8 *)MemToShadow(src_external_begin);
   } else if (!AddressIsPoisoned(dst_storage_begin)) {
-    AnnotateContainerGranuleAccessibleBytes(
-        dst_external_begin, dst_storage_begin - dst_external_begin);
+    SetContainerGranule(dst_external_begin,
+                        dst_storage_begin - dst_external_begin);
   }
 }
 
@@ -703,10 +683,9 @@ static void CopyContainerLastGranuleAnnotation(uptr src_storage_end,
   // Last granule
   uptr src_internal_end = RoundDownTo(src_storage_end, granularity);
   if (AddressIsPoisoned(src_storage_end)) {
-    CopyGranuleAnnotation(dst_internal_end, src_internal_end);
+    *(u8 *)MemToShadow(dst_internal_end) = *(u8 *)MemToShadow(src_internal_end);
   } else {
-    AnnotateContainerGranuleAccessibleBytes(dst_internal_end,
-                                            src_storage_end - src_internal_end);
+    SetContainerGranule(dst_internal_end, src_storage_end - src_internal_end);
   }
 }
 
@@ -763,7 +742,7 @@ void __sanitizer_copy_contiguous_container_annotations(const void *src_begin_p,
   bool copy_in_reversed_order = src_storage_begin < dst_storage_begin &&
                                 dst_storage_begin <= src_external_end;
   if (src_storage_begin % granularity != dst_storage_begin % granularity ||
-      WithinOneGranule(dst_storage_begin, dst_storage_end)) {
+      RoundDownTo(dst_storage_end - 1, granularity) <= dst_storage_begin) {
     if (copy_in_reversed_order) {
       SlowReversedCopyContainerAnnotations(src_storage_begin, src_storage_end,
                                            dst_storage_begin, dst_storage_end);