commit ba7b74e50c1f7e6835d5f5d539c4e22b067c2381
author Chia-hung Duan <chiahungduan@google.com> Fri Oct 14 06:36:47 2022 +0000
committer Copybara-Service <copybara-worker@google.com> Fri Oct 14 21:00:51 2022 -0700
tree 137e6f000a71819e6ce2e796c3d3870acf08db2f
parent 3cf01609e4867729b7a5d7ee0736d81bae797259

[scudo] Fix implicitly narrow casting (NFC)

u16 may be promoted to int by arithmetic type conversion. Do an explicit
cast to avoid certain compiler's warning. This fixes the problem
introduced by 0fb2aeef5310eaba2915b30810464a744a80da15

Differential Revision: https://reviews.llvm.org/D135985

GitOrigin-RevId: 3ead26e65bab612e6aead979646b40c6c15d9ba6

lib/scudo/standalone/local_cache.h

diff --git a/lib/scudo/standalone/local_cache.h b/lib/scudo/standalone/local_cache.h
index dfdea00..b36ec8f 100644
--- a/lib/scudo/standalone/local_cache.h
+++ b/lib/scudo/standalone/local_cache.h
@@ -151,7 +151,7 @@
     for (uptr I = 0; I < NumClasses; I++) {
       PerClass *P = &PerClassArray[I];
       const uptr Size = SizeClassAllocator::getSizeByClassId(I);
-      P->MaxCount = 2 * TransferBatch::getMaxCached(Size);
+      P->MaxCount = static_cast<u16>(2 * TransferBatch::getMaxCached(Size));
       if (I != BatchClassId) {
         P->ClassSize = Size;
       } else {
@@ -187,8 +187,9 @@
     if (UNLIKELY(!B))
       reportOutOfMemory(SizeClassAllocator::getSizeByClassId(BatchClassId));
     B->setFromArray(&C->Chunks[0], Count);
-    C->Count -= Count;
-    for (uptr I = 0; I < C->Count; I++)
+    // u16 will be promoted to int by arithmetic type conversion.
+    C->Count = static_cast<u16>(C->Count - Count);
+    for (u16 I = 0; I < C->Count; I++)
       C->Chunks[I] = C->Chunks[I + Count];
     Allocator->pushBatch(ClassId, B);
   }