commit d35163d49e9a0655372e20309f5ccf6f23558cbd
author Peter Collingbourne <peter@pcc.me.uk> Fri Apr 23 11:25:20 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Sun May 09 19:09:25 2021 -0700
tree ee4bde5c2e77141ba5da6fe3b5b68ca03de617dc
parent 4e28d9d378ed7dd2ea90cb11d4e910edfc1fe07f

scudo: Work around gcc 8 conversion warning.

Should fix:
https://lab.llvm.org/buildbot#builders/99/builds/2953

GitOrigin-RevId: f2819ee6cc46c89d049e8dca205c269e7c40cdc2

combined.h

diff --git a/combined.h b/combined.h
index 7ae6086..4c95b87 100644
--- a/combined.h
+++ b/combined.h
@@ -1049,8 +1049,10 @@
     const bool BypassQuarantine = !Quarantine.getCacheSize() ||
                                   ((Size - 1) >= QuarantineMaxChunkSize) ||
                                   !NewHeader.ClassId;
-    NewHeader.State =
-        BypassQuarantine ? Chunk::State::Available : Chunk::State::Quarantined;
+    if (BypassQuarantine)
+      NewHeader.State = Chunk::State::Available;
+    else
+      NewHeader.State = Chunk::State::Quarantined;
     NewHeader.OriginOrWasZeroed = useMemoryTagging<Params>(Options) &&
                                   NewHeader.ClassId &&
                                   !TSDRegistry.getDisableMemInit();