Commit 67a8b227 by Derek Mauro Committed by Copybara-Service

Fix MSVC builds that reject C-style arrays of size 0

std::array has a special-case to allow this
https://en.cppreference.com/w/cpp/container/array

Fixes #1332

PiperOrigin-RevId: 491703960
Change-Id: Ib83a1f0865448314e463e8ebf39ae3b842f762ea
parent ee2fc89e
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include <intrin.h> #include <intrin.h>
#endif #endif
#include <array>
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include <type_traits> #include <type_traits>
...@@ -87,8 +88,8 @@ constexpr int kIntLoadsPerVec = sizeof(__m128i) / sizeof(uint64_t); ...@@ -87,8 +88,8 @@ constexpr int kIntLoadsPerVec = sizeof(__m128i) / sizeof(uint64_t);
template <int vec_regions, int int_regions> template <int vec_regions, int int_regions>
inline void LargeTailCopy(crc32c_t* crcs, char** dst, const char** src, inline void LargeTailCopy(crc32c_t* crcs, char** dst, const char** src,
size_t region_size, size_t copy_rounds) { size_t region_size, size_t copy_rounds) {
__m128i data[vec_regions]; std::array<__m128i, vec_regions> data;
uint64_t int_data[kIntLoadsPerVec * int_regions]; std::array<uint64_t, kIntLoadsPerVec * int_regions> int_data;
while (copy_rounds > 0) { while (copy_rounds > 0) {
#ifdef __GNUC__ #ifdef __GNUC__
...@@ -241,8 +242,8 @@ crc32c_t AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute( ...@@ -241,8 +242,8 @@ crc32c_t AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute(
const std::size_t tail_size = length - (kRegions * region_size); const std::size_t tail_size = length - (kRegions * region_size);
// Holding registers for data in each region. // Holding registers for data in each region.
__m128i vec_data[vec_regions]; std::array<__m128i, vec_regions> vec_data;
uint64_t int_data[int_regions * kIntLoadsPerVec]; std::array<uint64_t, int_regions * kIntLoadsPerVec> int_data;
// Main loop. // Main loop.
while (copy_rounds > kBlocksPerCacheLine) { while (copy_rounds > kBlocksPerCacheLine) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment