X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2Ftest%2FRangeTest.cpp;h=42faf4dea14af05817c88cef57316889254ba343;hb=e229101b0e2fc1d9ccfbcb10be991cb62e19d32d;hp=0bf328aba3be863a165081c5333650ac4d660cf3;hpb=28a34a4e25f909d14639134701baaebc48524b0c;p=folly.git

diff --git a/folly/test/RangeTest.cpp b/folly/test/RangeTest.cpp
index 0bf328ab..42faf4de 100644
--- a/folly/test/RangeTest.cpp
+++ b/folly/test/RangeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,30 +20,27 @@
 #include <folly/Range.h>
 
 #include <array>
-#include <boost/range/concepts.hpp>
-#include <cstdlib>
-#include <gtest/gtest.h>
 #include <iterator>
 #include <limits>
 #include <random>
 #include <string>
-#include <sys/mman.h>
+#include <type_traits>
 #include <vector>
 
-namespace folly { namespace detail {
-
-// declaration of functions in Range.cpp
-size_t qfind_first_byte_of_memchr(const StringPiece& haystack,
-                                  const StringPiece& needles);
-
-size_t qfind_first_byte_of_byteset(const StringPiece& haystack,
-                                   const StringPiece& needles);
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/range/concepts.hpp>
 
-}}  // namespaces
+#include <folly/portability/GMock.h>
+#include <folly/portability/GTest.h>
+#include <folly/portability/Memory.h>
+#include <folly/portability/SysMman.h>
 
 using namespace folly;
+using namespace folly::detail;
 using namespace std;
 
+static_assert(std::is_literal_type<StringPiece>::value, "");
+
 BOOST_CONCEPT_ASSERT((boost::RandomAccessRangeConcept<StringPiece>));
 
 TEST(StringPiece, All) {
@@ -54,8 +51,8 @@ TEST(StringPiece, All) {
 
   // we expect the compiler to optimize things so that there's only one copy
   // of the string literal "foo", even though we've got it in multiple places
-  EXPECT_EQ(foo, foo2);  // remember, this uses ==, not strcmp, so it's a ptr
-                         // comparison rather than lexical
+  EXPECT_EQ(foo, foo2); // remember, this uses ==, not strcmp, so it's a ptr
+                        // comparison rather than lexical
 
   // the string object creates copies though, so the c_str of these should be
   // distinct
@@ -65,17 +62,17 @@ TEST(StringPiece, All) {
   StringPiece s(foo);
   EXPECT_EQ(s.size(), 3);
 
-  EXPECT_EQ(s.start(), foo);              // ptr comparison
-  EXPECT_NE(s.start(), fooStr.c_str());   // ptr comparison
-  EXPECT_NE(s.start(), foo2Str.c_str());  // ptr comparison
+  EXPECT_EQ(s.start(), foo); // ptr comparison
+  EXPECT_NE(s.start(), fooStr.c_str()); // ptr comparison
+  EXPECT_NE(s.start(), foo2Str.c_str()); // ptr comparison
 
-  EXPECT_EQ(s.toString(), foo);              // lexical comparison
-  EXPECT_EQ(s.toString(), fooStr.c_str());   // lexical comparison
-  EXPECT_EQ(s.toString(), foo2Str.c_str());  // lexical comparison
+  EXPECT_EQ(s.toString(), foo); // lexical comparison
+  EXPECT_EQ(s.toString(), fooStr.c_str()); // lexical comparison
+  EXPECT_EQ(s.toString(), foo2Str.c_str()); // lexical comparison
 
-  EXPECT_EQ(s, foo);                      // lexical comparison
-  EXPECT_EQ(s, fooStr);                   // lexical comparison
-  EXPECT_EQ(s, foo2Str);                  // lexical comparison
+  EXPECT_EQ(s, foo); // lexical comparison
+  EXPECT_EQ(s, fooStr); // lexical comparison
+  EXPECT_EQ(s, foo2Str); // lexical comparison
   EXPECT_EQ(foo, s);
 
   // check using StringPiece to reference substrings
@@ -100,7 +97,7 @@ TEST(StringPiece, All) {
   EXPECT_EQ(s.find("ba", 4), 6);
   EXPECT_EQ(s.find("notfound"), StringPiece::npos);
   EXPECT_EQ(s.find("notfound", 1), StringPiece::npos);
-  EXPECT_EQ(s.find("bar", 4), StringPiece::npos);  // starting position too far
+  EXPECT_EQ(s.find("bar", 4), StringPiece::npos); // starting position too far
   // starting pos that is obviously past the end -- This works for std::string
   EXPECT_EQ(s.toString().find("notfound", 55), StringPiece::npos);
   EXPECT_EQ(s.find("z", s.size()), StringPiece::npos);
@@ -116,7 +113,7 @@ TEST(StringPiece, All) {
   EXPECT_EQ(s.find('o', 2), 2);
   EXPECT_EQ(s.find('y'), StringPiece::npos);
   EXPECT_EQ(s.find('y', 1), StringPiece::npos);
-  EXPECT_EQ(s.find('o', 4), StringPiece::npos);  // starting position too far
+  EXPECT_EQ(s.find('o', 4), StringPiece::npos); // starting position too far
   EXPECT_TRUE(s.contains('z'));
   // starting pos that is obviously past the end -- This works for std::string
   EXPECT_EQ(s.toString().find('y', 55), StringPiece::npos);
@@ -269,10 +266,10 @@ TEST(StringPiece, EightBitComparisons) {
 TEST(StringPiece, ToByteRange) {
   StringPiece a("hello");
   ByteRange b(a);
-  EXPECT_EQ(static_cast<const void*>(a.begin()),
-            static_cast<const void*>(b.begin()));
-  EXPECT_EQ(static_cast<const void*>(a.end()),
-            static_cast<const void*>(b.end()));
+  EXPECT_EQ(
+      static_cast<const void*>(a.begin()), static_cast<const void*>(b.begin()));
+  EXPECT_EQ(
+      static_cast<const void*>(a.end()), static_cast<const void*>(b.end()));
 
   // and convert back again
   StringPiece c(b);
@@ -298,17 +295,17 @@ TEST(StringPiece, InvalidRange) {
   EXPECT_THROW(a.subpiece(6), std::out_of_range);
 }
 
-#if FOLLY_HAVE_CONSTEXPR_STRLEN
-constexpr char helloArray[] = "hello";
-
 TEST(StringPiece, Constexpr) {
+  constexpr const char* helloArray = "hello";
+
   constexpr StringPiece hello1("hello");
   EXPECT_EQ("hello", hello1);
+  static_assert(hello1.size() == 5, "hello size should be 5 at compile time");
 
   constexpr StringPiece hello2(helloArray);
   EXPECT_EQ("hello", hello2);
+  static_assert(hello2.size() == 5, "hello size should be 5 at compile time");
 }
-#endif
 
 TEST(StringPiece, Prefix) {
   StringPiece a("hello");
@@ -320,6 +317,15 @@ TEST(StringPiece, Prefix) {
   EXPECT_FALSE(a.startsWith('x'));
   EXPECT_FALSE(a.startsWith("x"));
 
+  EXPECT_TRUE(a.startsWith("", folly::AsciiCaseInsensitive()));
+  EXPECT_TRUE(a.startsWith("hello", folly::AsciiCaseInsensitive()));
+  EXPECT_TRUE(a.startsWith("hellO", folly::AsciiCaseInsensitive()));
+  EXPECT_TRUE(a.startsWith("HELL", folly::AsciiCaseInsensitive()));
+  EXPECT_TRUE(a.startsWith("H", folly::AsciiCaseInsensitive()));
+  EXPECT_FALSE(a.startsWith("HELLOX", folly::AsciiCaseInsensitive()));
+  EXPECT_FALSE(a.startsWith("x", folly::AsciiCaseInsensitive()));
+  EXPECT_FALSE(a.startsWith("X", folly::AsciiCaseInsensitive()));
+
   {
     auto b = a;
     EXPECT_TRUE(b.removePrefix(""));
@@ -367,6 +373,16 @@ TEST(StringPiece, Suffix) {
   EXPECT_FALSE(a.endsWith("x"));
   EXPECT_FALSE(a.endsWith('x'));
 
+  EXPECT_TRUE(a.endsWith("", folly::AsciiCaseInsensitive()));
+  EXPECT_TRUE(a.endsWith("o", folly::AsciiCaseInsensitive()));
+  EXPECT_TRUE(a.endsWith("O", folly::AsciiCaseInsensitive()));
+  EXPECT_TRUE(a.endsWith("hello", folly::AsciiCaseInsensitive()));
+  EXPECT_TRUE(a.endsWith("hellO", folly::AsciiCaseInsensitive()));
+  EXPECT_FALSE(a.endsWith("xhello", folly::AsciiCaseInsensitive()));
+  EXPECT_FALSE(a.endsWith("Xhello", folly::AsciiCaseInsensitive()));
+  EXPECT_FALSE(a.endsWith("x", folly::AsciiCaseInsensitive()));
+  EXPECT_FALSE(a.endsWith("X", folly::AsciiCaseInsensitive()));
+
   {
     auto b = a;
     EXPECT_TRUE(b.removeSuffix(""));
@@ -404,6 +420,13 @@ TEST(StringPiece, Suffix) {
   }
 }
 
+TEST(StringPiece, Equals) {
+  StringPiece a("hello");
+
+  EXPECT_TRUE(a.equals("HELLO", AsciiCaseInsensitive()));
+  EXPECT_FALSE(a.equals("HELLOX", AsciiCaseInsensitive()));
+}
+
 TEST(StringPiece, PrefixEmpty) {
   StringPiece a;
   EXPECT_TRUE(a.startsWith(""));
@@ -430,6 +453,43 @@ TEST(StringPiece, SuffixEmpty) {
   EXPECT_EQ("", a);
 }
 
+TEST(StringPiece, erase) {
+  StringPiece a("hello");
+  auto b = a.begin();
+  auto e = b + 1;
+  a.erase(b, e);
+  EXPECT_EQ("ello", a);
+
+  e = a.end();
+  b = e - 1;
+  a.erase(b, e);
+  EXPECT_EQ("ell", a);
+
+  b = a.end() - 1;
+  e = a.end() - 1;
+  EXPECT_THROW(a.erase(b, e), std::out_of_range);
+
+  b = a.begin();
+  e = a.end();
+  a.erase(b, e);
+  EXPECT_EQ("", a);
+
+  a = "hello";
+  b = a.begin();
+  e = b + 2;
+  a.erase(b, e);
+  EXPECT_EQ("llo", a);
+
+  b = a.end() - 2;
+  e = a.end();
+  a.erase(b, e);
+  EXPECT_EQ("l", a);
+
+  a = "      hello  ";
+  boost::algorithm::trim(a);
+  EXPECT_EQ(a, "hello");
+}
+
 TEST(StringPiece, split_step_char_delimiter) {
   //              0         1         2
   //              012345678901234567890123456
@@ -566,72 +626,72 @@ TEST(StringPiece, split_step_with_process_char_delimiter) {
   EXPECT_EQ(s, p);
 
   EXPECT_EQ(1, (p.split_step(' ', [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 5), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("this", x);
-    return 1;
-  })));
+              EXPECT_EQ(std::next(s, 5), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("this", x);
+              return 1;
+            })));
 
   EXPECT_EQ(2, (p.split_step(' ', [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 8), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("is", x);
-    return 2;
-  })));
+              EXPECT_EQ(std::next(s, 8), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("is", x);
+              return 2;
+            })));
 
   EXPECT_EQ(3, (p.split_step('u', [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 10), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("j", x);
-    return 3;
-  })));
+              EXPECT_EQ(std::next(s, 10), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("j", x);
+              return 3;
+            })));
 
   EXPECT_EQ(4, (p.split_step(' ', [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 13), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("st", x);
-    return 4;
-  })));
+              EXPECT_EQ(std::next(s, 13), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("st", x);
+              return 4;
+            })));
 
   EXPECT_EQ(5, (p.split_step(' ', [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 14), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("", x);
-    return 5;
-  })));
+              EXPECT_EQ(std::next(s, 14), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("", x);
+              return 5;
+            })));
 
   EXPECT_EQ(6, (p.split_step(' ', [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 16), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("a", x);
-    return 6;
-  })));
+              EXPECT_EQ(std::next(s, 16), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("a", x);
+              return 6;
+            })));
 
   EXPECT_EQ(7, (p.split_step(' ', [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 21), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("test", x);
-    return 7;
-  })));
+              EXPECT_EQ(std::next(s, 21), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("test", x);
+              return 7;
+            })));
 
   EXPECT_EQ(8, (p.split_step(' ', [&](folly::StringPiece x) {
-    EXPECT_EQ(e, p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("string", x);
-    return 8;
-  })));
+              EXPECT_EQ(e, p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("string", x);
+              return 8;
+            })));
 
   EXPECT_EQ(9, (p.split_step(' ', [&](folly::StringPiece x) {
-    EXPECT_EQ(e, p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("", x);
-    return 9;
-  })));
+              EXPECT_EQ(e, p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("", x);
+              return 9;
+            })));
 
-  EXPECT_TRUE((std::is_same<
-    void,
-    decltype(p.split_step(' ', split_step_with_process_noop))
-  >::value));
+  EXPECT_TRUE(
+      (std::is_same<
+          void,
+          decltype(p.split_step(' ', split_step_with_process_noop))>::value));
 
   EXPECT_NO_THROW(p.split_step(' ', split_step_with_process_noop));
 }
@@ -649,79 +709,79 @@ TEST(StringPiece, split_step_with_process_range_delimiter) {
   EXPECT_EQ(s, p);
 
   EXPECT_EQ(1, (p.split_step("  ", [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 6), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("this", x);
-    return 1;
-  })));
+              EXPECT_EQ(std::next(s, 6), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("this", x);
+              return 1;
+            })));
 
   EXPECT_EQ(2, (p.split_step("  ", [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 10), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("is", x);
-    return 2;
-  })));
+              EXPECT_EQ(std::next(s, 10), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("is", x);
+              return 2;
+            })));
 
   EXPECT_EQ(3, (p.split_step("u", [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 12), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("j", x);
-    return 3;
-  })));
+              EXPECT_EQ(std::next(s, 12), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("j", x);
+              return 3;
+            })));
 
   EXPECT_EQ(4, (p.split_step("  ", [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 16), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("st", x);
-    return 4;
-  })));
+              EXPECT_EQ(std::next(s, 16), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("st", x);
+              return 4;
+            })));
 
   EXPECT_EQ(5, (p.split_step("  ", [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 18), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("", x);
-    return 5;
-  })));
+              EXPECT_EQ(std::next(s, 18), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("", x);
+              return 5;
+            })));
 
   EXPECT_EQ(6, (p.split_step("  ", [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 21), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("a", x);
-    return 6;
-  })));
+              EXPECT_EQ(std::next(s, 21), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("a", x);
+              return 6;
+            })));
 
   EXPECT_EQ(7, (p.split_step("  ", [&](folly::StringPiece x) {
-    EXPECT_EQ(std::next(s, 28), p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ(" test", x);
-    return 7;
-  })));
+              EXPECT_EQ(std::next(s, 28), p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ(" test", x);
+              return 7;
+            })));
 
   EXPECT_EQ(8, (p.split_step("  ", [&](folly::StringPiece x) {
-    EXPECT_EQ(e, p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("string", x);
-    return 8;
-  })));
+              EXPECT_EQ(e, p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("string", x);
+              return 8;
+            })));
 
   EXPECT_EQ(9, (p.split_step("  ", [&](folly::StringPiece x) {
-    EXPECT_EQ(e, p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("", x);
-    return 9;
-  })));
+              EXPECT_EQ(e, p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("", x);
+              return 9;
+            })));
 
   EXPECT_EQ(10, (p.split_step("  ", [&](folly::StringPiece x) {
-    EXPECT_EQ(e, p.begin());
-    EXPECT_EQ(e, p.end());
-    EXPECT_EQ("", x);
-    return 10;
-  })));
+              EXPECT_EQ(e, p.begin());
+              EXPECT_EQ(e, p.end());
+              EXPECT_EQ("", x);
+              return 10;
+            })));
 
-  EXPECT_TRUE((std::is_same<
-    void,
-    decltype(p.split_step(' ', split_step_with_process_noop))
-  >::value));
+  EXPECT_TRUE(
+      (std::is_same<
+          void,
+          decltype(p.split_step(' ', split_step_with_process_noop))>::value));
 
   EXPECT_NO_THROW(p.split_step(' ', split_step_with_process_noop));
 }
@@ -739,10 +799,7 @@ TEST(StringPiece, split_step_with_process_char_delimiter_additional_args) {
   EXPECT_EQ(e, p.end());
   EXPECT_EQ(s, p);
 
-  auto const functor = [](
-    folly::StringPiece s,
-    folly::StringPiece expected
-  ) {
+  auto const functor = [](folly::StringPiece s, folly::StringPiece expected) {
     EXPECT_EQ(expected, s);
     return expected;
   };
@@ -777,10 +834,7 @@ TEST(StringPiece, split_step_with_process_range_delimiter_additional_args) {
   EXPECT_EQ(e, p.end());
   EXPECT_EQ(s, p);
 
-  auto const functor = [](
-    folly::StringPiece s,
-    folly::StringPiece expected
-  ) {
+  auto const functor = [](folly::StringPiece s, folly::StringPiece expected) {
     EXPECT_EQ(expected, s);
     return expected;
   };
@@ -802,6 +856,20 @@ TEST(StringPiece, split_step_with_process_range_delimiter_additional_args) {
   EXPECT_TRUE(p.empty());
 }
 
+TEST(StringPiece, NoInvalidImplicitConversions) {
+  struct IsString {
+    bool operator()(folly::Range<int*>) {
+      return false;
+    }
+    bool operator()(folly::StringPiece) {
+      return true;
+    }
+  };
+
+  std::string s = "hello";
+  EXPECT_TRUE(IsString()(s));
+}
+
 TEST(qfind, UInt32_Ranges) {
   vector<uint32_t> a({1, 2, 3, 260, 5});
   vector<uint32_t> b({2, 3, 4});
@@ -837,20 +905,14 @@ struct NoSseNeedleFinder {
   }
 };
 
-struct MemchrNeedleFinder {
-  static size_t find_first_byte_of(StringPiece haystack, StringPiece needles) {
-    return detail::qfind_first_byte_of_memchr(haystack, needles);
-  }
-};
-
 struct ByteSetNeedleFinder {
   static size_t find_first_byte_of(StringPiece haystack, StringPiece needles) {
     return detail::qfind_first_byte_of_byteset(haystack, needles);
   }
 };
 
-typedef ::testing::Types<SseNeedleFinder, NoSseNeedleFinder, MemchrNeedleFinder,
-                         ByteSetNeedleFinder> NeedleFinders;
+using NeedleFinders =
+    ::testing::Types<SseNeedleFinder, NoSseNeedleFinder, ByteSetNeedleFinder>;
 TYPED_TEST_CASE(NeedleFinderTest, NeedleFinders);
 
 TYPED_TEST(NeedleFinderTest, Null) {
@@ -892,9 +954,9 @@ TYPED_TEST(NeedleFinderTest, Empty) {
 TYPED_TEST(NeedleFinderTest, Unaligned) {
   // works correctly even if input buffers are not 16-byte aligned
   string s = "0123456789ABCDEFGH";
-  for (int i = 0; i < s.size(); ++i) {
+  for (size_t i = 0; i < s.size(); ++i) {
     StringPiece a(s.c_str() + i);
-    for (int j = 0; j < s.size(); ++j) {
+    for (size_t j = 0; j < s.size(); ++j) {
       StringPiece b(s.c_str() + j);
       EXPECT_EQ((i > j) ? 0 : j - i, this->find_first_byte_of(a, b));
     }
@@ -909,7 +971,7 @@ TYPED_TEST(NeedleFinderTest, Needles256) {
   const auto maxValue = std::numeric_limits<StringPiece::value_type>::max();
   // make the size ~big to avoid any edge-case branches for tiny haystacks
   const int haystackSize = 50;
-  for (int i = minValue; i <= maxValue; i++) {  // <=
+  for (int i = minValue; i <= maxValue; i++) { // <=
     needles.push_back(i);
   }
   EXPECT_EQ(StringPiece::npos, this->find_first_byte_of("", needles));
@@ -925,7 +987,7 @@ TYPED_TEST(NeedleFinderTest, Needles256) {
 }
 
 TYPED_TEST(NeedleFinderTest, Base) {
-  for (int i = 0; i < 32; ++i) {
+  for (size_t i = 0; i < 32; ++i) {
     for (int j = 0; j < 32; ++j) {
       string s = string(i, 'X') + "abca" + string(i, 'X');
       string delims = string(j, 'Y') + "a" + string(j, 'Y');
@@ -942,19 +1004,22 @@ const size_t kPageSize = 4096;
 // This function will also initialize buf, which caller must free().
 void createProtectedBuf(StringPiece& contents, char** buf) {
   ASSERT_LE(contents.size(), kPageSize);
-  const size_t kSuccess = 0;
-  if (kSuccess != posix_memalign((void**)buf, kPageSize, 4 * kPageSize)) {
-    ASSERT_FALSE(true);
+  char* pageAlignedBuf = (char*)aligned_malloc(2 * kPageSize, kPageSize);
+  if (pageAlignedBuf == nullptr) {
+    FAIL();
   }
-  mprotect(*buf + kPageSize, kPageSize, PROT_NONE);
+  // Protect the page after the first full page-aligned region of the
+  // malloc'ed buffer
+  mprotect(pageAlignedBuf + kPageSize, kPageSize, PROT_NONE);
   size_t newBegin = kPageSize - contents.size();
-  memcpy(*buf + newBegin, contents.data(), contents.size());
-  contents.reset(*buf + newBegin, contents.size());
+  memcpy(pageAlignedBuf + newBegin, contents.data(), contents.size());
+  contents.reset(pageAlignedBuf + newBegin, contents.size());
+  *buf = pageAlignedBuf;
 }
 
 void freeProtectedBuf(char* buf) {
   mprotect(buf + kPageSize, kPageSize, PROT_READ | PROT_WRITE);
-  free(buf);
+  aligned_free(buf);
 }
 
 TYPED_TEST(NeedleFinderTest, NoSegFault) {
@@ -979,13 +1044,13 @@ TYPED_TEST(NeedleFinderTest, NoSegFault) {
         //        string(s1.data(), s1.size()).c_str(), s1.size(),
         //        string(s2.data(), s2.size()).c_str(), s2.size());
         auto r1 = this->find_first_byte_of(s1, s2);
-        auto f1 = std::find_first_of(s1.begin(), s1.end(),
-                                     s2.begin(), s2.end());
+        auto f1 =
+            std::find_first_of(s1.begin(), s1.end(), s2.begin(), s2.end());
         auto e1 = (f1 == s1.end()) ? StringPiece::npos : f1 - s1.begin();
         EXPECT_EQ(r1, e1);
         auto r2 = this->find_first_byte_of(s2, s1);
-        auto f2 = std::find_first_of(s2.begin(), s2.end(),
-                                     s1.begin(), s1.end());
+        auto f2 =
+            std::find_first_of(s2.begin(), s2.end(), s1.begin(), s1.end());
         auto e2 = (f2 == s2.end()) ? StringPiece::npos : f2 - s2.begin();
         EXPECT_EQ(r2, e2);
         freeProtectedBuf(buf1);
@@ -1010,16 +1075,31 @@ TEST(NonConstTest, StringPiece) {
   }
 }
 
-template<class C>
+// Similar to the begin() template functions, but instread of returing
+// an iterator, return a pointer to data.
+template <class Container>
+typename Container::value_type* dataPtr(Container& cont) {
+  // NOTE: &cont[0] is undefined if cont is empty (it creates a
+  // reference to nullptr - which is not dereferenced, but still UBSAN).
+  return cont.data();
+}
+template <class T, size_t N>
+constexpr T* dataPtr(T (&arr)[N]) noexcept {
+  return &arr[0];
+}
+
+template <class C>
 void testRangeFunc(C&& x, size_t n) {
   const auto& cx = x;
   // type, conversion checks
-  Range<int*> r1 = range(std::forward<C>(x));
+  using R1Iter =
+      _t<std::conditional<_t<std::is_reference<C>>::value, int*, int const*>>;
+  Range<R1Iter> r1 = range(std::forward<C>(x));
   Range<const int*> r2 = range(std::forward<C>(x));
   Range<const int*> r3 = range(cx);
   Range<const int*> r5 = range(std::move(cx));
-  EXPECT_EQ(r1.begin(), &x[0]);
-  EXPECT_EQ(r1.end(), &x[n]);
+  EXPECT_EQ(r1.begin(), dataPtr(x));
+  EXPECT_EQ(r1.end(), dataPtr(x) + n);
   EXPECT_EQ(n, r1.size());
   EXPECT_EQ(n, r2.size());
   EXPECT_EQ(n, r3.size());
@@ -1040,14 +1120,123 @@ TEST(RangeFunc, Array) {
 }
 
 TEST(RangeFunc, CArray) {
-  int x[] {1, 2, 3, 4};
+  int x[]{1, 2, 3, 4};
   testRangeFunc(x, 4);
 }
 
+TEST(RangeFunc, ConstexprCArray) {
+  static constexpr const int numArray[4] = {3, 17, 1, 9};
+  constexpr const auto numArrayRange = range(numArray);
+  EXPECT_EQ(17, numArrayRange[1]);
+  constexpr const auto numArrayRangeSize = numArrayRange.size();
+  EXPECT_EQ(4, numArrayRangeSize);
+}
+
+TEST(RangeFunc, ConstexprStdArray) {
+  static constexpr const std::array<int, 4> numArray = {{3, 17, 1, 9}};
+  constexpr const auto numArrayRange = range(numArray);
+  EXPECT_EQ(17, numArrayRange[1]);
+  constexpr const auto numArrayRangeSize = numArrayRange.size();
+  EXPECT_EQ(4, numArrayRangeSize);
+}
+
+TEST(RangeFunc, ConstexprStdArrayZero) {
+  static constexpr const std::array<int, 0> numArray = {};
+  constexpr const auto numArrayRange = range(numArray);
+  constexpr const auto numArrayRangeSize = numArrayRange.size();
+  EXPECT_EQ(0, numArrayRangeSize);
+}
+
+TEST(RangeFunc, ConstexprIteratorPair) {
+  static constexpr const int numArray[4] = {3, 17, 1, 9};
+  constexpr const auto numPtr = static_cast<const int*>(numArray);
+  constexpr const auto numIterRange = range(numPtr + 1, numPtr + 3);
+  EXPECT_EQ(1, numIterRange[1]);
+  constexpr const auto numIterRangeSize = numIterRange.size();
+  EXPECT_EQ(2, numIterRangeSize);
+}
+
+TEST(RangeFunc, ConstexprCollection) {
+  class IntCollection {
+   public:
+    constexpr IntCollection(const int* d, size_t s) : data_(d), size_(s) {}
+    constexpr const int* data() const {
+      return data_;
+    }
+    constexpr size_t size() const {
+      return size_;
+    }
+
+   private:
+    const int* data_;
+    size_t size_;
+  };
+  static constexpr const int numArray[4] = {3, 17, 1, 9};
+  constexpr const auto numPtr = static_cast<const int*>(numArray);
+  constexpr const auto numColl = IntCollection(numPtr + 1, 2);
+  constexpr const auto numCollRange = range(numColl);
+  EXPECT_EQ(1, numCollRange[1]);
+  constexpr const auto numCollRangeSize = numCollRange.size();
+  EXPECT_EQ(2, numCollRangeSize);
+}
+
+TEST(CRangeFunc, CArray) {
+  int numArray[4] = {3, 17, 1, 9};
+  auto const numArrayRange = crange(numArray);
+  EXPECT_TRUE(
+      (std::is_same<int const*, decltype(numArrayRange)::iterator>::value));
+  EXPECT_THAT(numArrayRange, testing::ElementsAreArray(numArray));
+}
+
+TEST(CRangeFunc, StdArray) {
+  std::array<int, 4> numArray = {{3, 17, 1, 9}};
+  auto const numArrayRange = crange(numArray);
+  EXPECT_TRUE(
+      (std::is_same<int const*, decltype(numArrayRange)::iterator>::value));
+  EXPECT_THAT(numArrayRange, testing::ElementsAreArray(numArray));
+}
+
+TEST(CRangeFunc, StdArrayZero) {
+  std::array<int, 0> numArray = {};
+  auto const numArrayRange = crange(numArray);
+  EXPECT_TRUE(
+      (std::is_same<int const*, decltype(numArrayRange)::iterator>::value));
+  EXPECT_THAT(numArrayRange, testing::IsEmpty());
+}
+
+TEST(CRangeFunc, Collection) {
+  class IntCollection {
+   public:
+    constexpr IntCollection(int* d, size_t s) : data_(d), size_(s) {}
+    constexpr int* data() {
+      return data_;
+    }
+    constexpr int const* data() const {
+      return data_;
+    }
+    constexpr size_t size() const {
+      return size_;
+    }
+
+   private:
+    int* data_;
+    size_t size_;
+  };
+  int numArray[4] = {3, 17, 1, 9};
+  auto numPtr = static_cast<int*>(numArray);
+  auto numColl = IntCollection(numPtr + 1, 2);
+  auto const numCollRange = crange(numColl);
+  EXPECT_TRUE(
+      (std::is_same<int const*, decltype(numCollRange)::iterator>::value));
+  EXPECT_THAT(numCollRange, testing::ElementsAreArray({17, 1}));
+}
+
 std::string get_rand_str(
-    int size, std::uniform_int_distribution<>& dist, std::mt19937& gen) {
+    size_t size,
+    std::uniform_int_distribution<>& dist,
+    std::mt19937& gen) {
   std::string ret(size, '\0');
-  for (int i=0; i<size; ++i) {
+  for (size_t i = 0; i < size; ++i) {
     ret[i] = static_cast<char>(dist(gen));
   }
 
@@ -1062,7 +1251,7 @@ bool operator==(MutableStringPiece mp, StringPiece sp) {
 bool operator==(StringPiece sp, MutableStringPiece mp) {
   return mp.compare(sp) == 0;
 }
-}
+} // namespace folly
 
 TEST(ReplaceAt, exhaustiveTest) {
   char input[] = "this is nice and long input";
@@ -1072,10 +1261,10 @@ TEST(ReplaceAt, exhaustiveTest) {
   std::mt19937 gen(rd());
   std::uniform_int_distribution<> dist('a', 'z');
 
-  for (int i=0; i < 100; ++i) {
-    for (int j = 1; j <= msp.size(); ++j) {
+  for (int i = 0; i < 100; ++i) {
+    for (size_t j = 1; j <= msp.size(); ++j) {
       auto replacement = get_rand_str(j, dist, gen);
-      for (int pos=0; pos < msp.size() - j; ++pos) {
+      for (size_t pos = 0; pos < msp.size() - j; ++pos) {
         msp.replaceAt(pos, replacement);
         str.replace(pos, replacement.size(), replacement);
         EXPECT_EQ(msp.compare(str), 0);
@@ -1128,10 +1317,10 @@ TEST(ReplaceAll, randomTest) {
   std::mt19937 gen(rd());
   std::uniform_int_distribution<> dist('A', 'Z');
 
-  for (int i=0; i < 100; ++i) {
-    for (int j = 1; j <= orig.size(); ++j) {
+  for (int i = 0; i < 100; ++i) {
+    for (size_t j = 1; j <= orig.size(); ++j) {
       auto replacement = get_rand_str(j, dist, gen);
-      for (int pos=0; pos < msp.size() - j; ++pos) {
+      for (size_t pos = 0; pos < msp.size() - j; ++pos) {
         auto piece = orig.substr(pos, j);
         EXPECT_EQ(msp.replaceAll(piece, replacement), 1);
         EXPECT_EQ(msp.find(replacement), pos);
@@ -1147,7 +1336,7 @@ TEST(ReplaceAll, BadArg) {
   auto fst = "longer";
   auto snd = "small";
   char input[] = "meh meh meh";
-  auto all =  MutableStringPiece(input);
+  auto all = MutableStringPiece(input);
 
   try {
     all.replaceAll(fst, snd);
@@ -1163,3 +1352,84 @@ TEST(ReplaceAll, BadArg) {
 
   EXPECT_EQ(count, 2);
 }
+
+TEST(Range, Constructors) {
+  vector<int> c = {1, 2, 3};
+  typedef Range<vector<int>::iterator> RangeType;
+  typedef Range<vector<int>::const_iterator> ConstRangeType;
+  RangeType cr(c.begin(), c.end());
+  auto subpiece1 = ConstRangeType(cr, 1, 5);
+  auto subpiece2 = ConstRangeType(cr, 1);
+  EXPECT_EQ(subpiece1.size(), 2);
+  EXPECT_EQ(subpiece1.begin(), subpiece2.begin());
+  EXPECT_EQ(subpiece1.end(), subpiece2.end());
+}
+
+TEST(Range, ArrayConstructors) {
+  auto charArray = std::array<char, 4>{{'t', 'e', 's', 't'}};
+  auto constCharArray = std::array<char, 6>{{'f', 'o', 'o', 'b', 'a', 'r'}};
+  auto emptyArray = std::array<char, 0>{};
+
+  auto sp1 = StringPiece{charArray};
+  EXPECT_EQ(4, sp1.size());
+  EXPECT_EQ(charArray.data(), sp1.data());
+
+  auto sp2 = StringPiece(constCharArray);
+  EXPECT_EQ(6, sp2.size());
+  EXPECT_EQ(constCharArray.data(), sp2.data());
+
+  auto msp = MutableStringPiece(charArray);
+  EXPECT_EQ(4, msp.size());
+  EXPECT_EQ(charArray.data(), msp.data());
+
+  auto esp = StringPiece(emptyArray);
+  EXPECT_EQ(0, esp.size());
+  EXPECT_EQ(nullptr, esp.data());
+
+  auto emsp = MutableStringPiece(emptyArray);
+  EXPECT_EQ(0, emsp.size());
+  EXPECT_EQ(nullptr, emsp.data());
+
+  static constexpr std::array<int, 4> numArray = {{3, 17, 1, 9}};
+  constexpr auto numRange = Range<const int*>{numArray};
+  EXPECT_EQ(17, numRange[1]);
+
+  static constexpr std::array<int, 0> emptyNumArray{};
+  constexpr auto emptyNumRange = Range<const int*>{emptyNumArray};
+  EXPECT_EQ(0, emptyNumRange.size());
+}
+
+TEST(Range, ConstexprAccessors) {
+  constexpr StringPiece piece = range("hello");
+  static_assert(piece.size() == 6u, "");
+  static_assert(piece.end() - piece.begin() == 6u, "");
+  static_assert(piece.data() == piece.begin(), "");
+  static_assert(piece.start() == piece.begin(), "");
+  static_assert(piece.cbegin() == piece.begin(), "");
+  static_assert(piece.cend() == piece.end(), "");
+  static_assert(*piece.begin() == 'h', "");
+  static_assert(*(piece.end() - 1) == '\0', "");
+}
+
+TEST(Range, LiteralSuffix) {
+  constexpr auto literalPiece = "hello"_sp;
+  constexpr StringPiece piece = "hello";
+  EXPECT_EQ(literalPiece, piece);
+  constexpr auto literalPiece8 = u8"hello"_sp;
+  constexpr Range<char const*> piece8 = u8"hello";
+  EXPECT_EQ(literalPiece8, piece8);
+  constexpr auto literalPiece16 = u"hello"_sp;
+  constexpr Range<char16_t const*> piece16{u"hello", 5};
+  EXPECT_EQ(literalPiece16, piece16);
+  constexpr auto literalPiece32 = U"hello"_sp;
+  constexpr Range<char32_t const*> piece32{U"hello", 5};
+  EXPECT_EQ(literalPiece32, piece32);
+  constexpr auto literalPieceW = L"hello"_sp;
+  constexpr Range<wchar_t const*> pieceW{L"hello", 5};
+  EXPECT_EQ(literalPieceW, pieceW);
+}
+
+TEST(Range, LiteralSuffixContainsNulBytes) {
+  constexpr auto literalPiece = "\0foo\0"_sp;
+  EXPECT_EQ(5u, literalPiece.size());
+}