Index: compiler-rt/include/fuzzer/FuzzedDataProvider.h
===================================================================
--- compiler-rt/include/fuzzer/FuzzedDataProvider.h
+++ compiler-rt/include/fuzzer/FuzzedDataProvider.h
@@ -14,6 +14,7 @@
 #define LLVM_FUZZER_FUZZED_DATA_PROVIDER_H_
 
 #include <algorithm>
+#include <array>
 #include <climits>
 #include <cstddef>
 #include <cstdint>
@@ -71,6 +72,7 @@
 
   // Returns a value from the given array.
   template <typename T, size_t size> T PickValueInArray(const T (&array)[size]);
+  template <typename T, size_t size> T PickValueInArray(const std::array<T, size>& array);
   template <typename T> T PickValueInArray(std::initializer_list<const T> list);
 
   // Writes data to the given destination and returns number of bytes written.
@@ -301,6 +303,12 @@
   return array[ConsumeIntegralInRange<size_t>(0, size - 1)];
 }
 
+template <typename T, size_t size>
+T FuzzedDataProvider::PickValueInArray(const std::array<T, size>& array) {
+  static_assert(size > 0, "The array must be non empty.");
+  return array[ConsumeIntegralInRange<size_t>(0, size - 1)];
+}
+
 template <typename T>
 T FuzzedDataProvider::PickValueInArray(std::initializer_list<const T> list) {
   // TODO(Dor1s): switch to static_assert once C++14 is allowed.
Index: compiler-rt/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp
===================================================================
--- compiler-rt/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp
+++ compiler-rt/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp
@@ -286,6 +286,7 @@
 TEST(FuzzedDataProvider, PickValueInArray) {
   FuzzedDataProvider DataProv(Data, sizeof(Data));
   const int Array[] = {1, 2, 3, 4, 5};
+  const std::array<int, 5> SameArray = {1, 2, 3, 4, 5};
   EXPECT_EQ(5, DataProv.PickValueInArray(Array));
   EXPECT_EQ(2, DataProv.PickValueInArray(Array));
   EXPECT_EQ(2, DataProv.PickValueInArray(Array));
@@ -296,6 +297,16 @@
   EXPECT_EQ(3, DataProv.PickValueInArray(Array));
   EXPECT_EQ(2, DataProv.PickValueInArray(Array));
 
+  EXPECT_EQ(5, DataProv.PickValueInArray(SameArray));
+  EXPECT_EQ(2, DataProv.PickValueInArray(SameArray));
+  EXPECT_EQ(2, DataProv.PickValueInArray(SameArray));
+  EXPECT_EQ(3, DataProv.PickValueInArray(SameArray));
+  EXPECT_EQ(3, DataProv.PickValueInArray(SameArray));
+  EXPECT_EQ(3, DataProv.PickValueInArray(SameArray));
+  EXPECT_EQ(1, DataProv.PickValueInArray(SameArray));
+  EXPECT_EQ(3, DataProv.PickValueInArray(SameArray));
+  EXPECT_EQ(2, DataProv.PickValueInArray(SameArray));
+
   EXPECT_EQ(uint8_t(0x9D), DataProv.PickValueInArray(Data));
   EXPECT_EQ(uint8_t(0xBA), DataProv.PickValueInArray(Data));
   EXPECT_EQ(uint8_t(0x69), DataProv.PickValueInArray(Data));