From: Philip Pronin <philipp@fb.com>
Date: Thu, 6 Feb 2014 08:09:22 +0000 (-0800)
Subject: fix missing change from D1156950
X-Git-Tag: v0.22.0~702
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bac28da15f8144f5d43773fb892a701e3f058ad4;p=folly.git

fix missing change from D1156950

Test Plan: fbconfig -r folly/experimental/test:eliasfano_test && fbmake runtests_opt

Reviewed By: lucian@fb.com

FB internal diff: D1161670
---

diff --git a/folly/experimental/EliasFanoCoding.h b/folly/experimental/EliasFanoCoding.h
index 228a2fc1..c8e8e3cf 100644
--- a/folly/experimental/EliasFanoCoding.h
+++ b/folly/experimental/EliasFanoCoding.h
@@ -213,7 +213,12 @@ struct EliasFanoEncoder {
     /* static */ if (forwardQuantum != 0) {
       // Workaround to avoid 'division by zero' compile-time error.
       constexpr size_t q = forwardQuantum ?: 1;
-      CHECK_LT(upperSizeBits, std::numeric_limits<SkipValueType>::max());
+      /* static */ if (kVersion > 0) {
+        CHECK_LT(upperBound >> numLowerBits,
+                 std::numeric_limits<SkipValueType>::max());
+      } else {
+        CHECK_LT(upperSizeBits, std::numeric_limits<SkipValueType>::max());
+      }
 
       numForwardPointers = size / q;
       forwardPointers = static_cast<SkipValueType*>(