Make Observer stress test pass a stress run

[folly.git] / folly / Varint.h

diff --git a/folly/Varint.h b/folly/Varint.h
index d2e661eb7bf498fcffcedf5d5c1ed07034362926..859535736e764351cf32469473fb9a30bf010781 100644 (file)
--- a/folly/Varint.h
+++ b/folly/Varint.h
@@ -71,7 +71,8 @@ uint64_t decodeVarint(Range<T*>& data);
 inline uint64_t encodeZigZag(int64_t val) {
   // Bit-twiddling magic stolen from the Google protocol buffer document;
   // val >> 63 is an arithmetic shift because val is signed
-  return static_cast<uint64_t>((val << 1) ^ (val >> 63));
+  auto uval = static_cast<uint64_t>(val);
+  return static_cast<uint64_t>((uval << 1) ^ (val >> 63));
 }
 
 inline int64_t decodeZigZag(uint64_t val) {
@@ -132,7 +133,7 @@ inline uint64_t decodeVarint(Range<T*>& data) {
     val |= static_cast<uint64_t>(*p++) << shift;
   }
 
-  data.advance(p - begin);
+  data.uncheckedAdvance(p - begin);
   return val;
 }