[benchmark] Fix 32-bit build failure

[kbobyrev]

Summary

This patch applies upstream commit: https://github.com/google/benchmark/commit/f0901417c89d123474e6b91365029cfe32cf89dc

Tim Northover pointed out that benchmark build might be broken on 32-bit macOS. This commit by Roman Lebedev (lebedev.ri) resolves the issue.

[kbobyrev]

@lebedev.ri thank you very much for the patch! Should I wait for the Pull Request to be accepted and for the patch to land in upstream?

[lebedev.ri]

Am i supposed to review my own patch? :) LG, i guess.
Note that it is not yet applied upstream, though the only thing that is likely to change there is .travis.yml

[lebedev.ri]

In D51677#1224441, @kbobyrev wrote:

@lebedev.ri thank you very much for the patch! Should I wait for the Pull Request to be accepted and for the patch to land in upstream?

Ah, commented too quickly. I *think* this can land right away.

[kbobyrev]

In D51677#1224454, @lebedev.ri wrote:

Am i supposed to review my own patch? :) LG, i guess.
Note that it is not yet applied upstream, though the only thing that is likely to change there is .travis.yml

Yeah, my question is basically whether I should wait for it to be applied upstream and see if it indeed doesn't break anything. I can see Windows buildbot failure in the GitHub PR, but I have disabled it on Windows because of what seemingly is clang-cl stage 2 bug (http://lab.llvm.org:8011/builders/clang-x86-windows-msvc2015/builds/13495/steps/build%20stage%202/logs/stdio).

[lebedev.ri]

In D51677#1224468, @kbobyrev wrote:

In D51677#1224454, @lebedev.ri wrote:

Am i supposed to review my own patch? :) LG, i guess.
Note that it is not yet applied upstream, though the only thing that is likely to change there is .travis.yml

Yeah, my question is basically whether I should wait for it to be applied upstream and see if it indeed doesn't break anything.

Done, feel free to land.

In D51677#1224468, @kbobyrev wrote:

I can see Windows buildbot failure in the GitHub PR, but I have disabled it on Windows because of what seemingly is clang-cl stage 2 bug (http://lab.llvm.org:8011/builders/clang-x86-windows-msvc2015/builds/13495/steps/build%20stage%202/logs/stdio).

[kbobyrev]

Thanks!

llvm/trunk/utils/benchmark/README.LLVM

 LLVM notes
 ----------
 
 This directory contains the Google Benchmark source code. Currently, the checked
 Benchmark library version is v1.4.1.
 
 This directory is under a different license than LLVM.
 
 Changes:
 
 * Bazel BUILD files are removed from the library
 * https://github.com/google/benchmark/commit/f85304e4e3a0e4e1bf15b91720df4a19e90b589f
   is applied on top of the v1.4.1 to silence compiler warnings
 * https://github.com/google/benchmark/commit/505be96ab23056580a3a2315abba048f4428b04e
   is applied to comply with the LLVM's required CMake version
+* https://github.com/google/benchmark/commit/f0901417c89d123474e6b91365029cfe32cf89dc
+  is applied to fix 32-bit build failure on macOS

llvm/trunk/utils/benchmark/src/sysinfo.cc

std::vector<CPUInfo::CacheInfo> GetCacheSizesMacOSX() {
   std::vector<CPUInfo::CacheInfo> res;
   std::array<uint64_t, 4> CacheCounts{{0, 0, 0, 0}};
   GetSysctl("hw.cacheconfig", &CacheCounts);
 
   struct {
     std::string name;
     std::string type;
     int level;
-    size_t num_sharing;
+    uint64_t num_sharing;
   } Cases[] = {{"hw.l1dcachesize", "Data", 1, CacheCounts[1]},
                {"hw.l1icachesize", "Instruction", 1, CacheCounts[1]},
                {"hw.l2cachesize", "Unified", 2, CacheCounts[2]},
                {"hw.l3cachesize", "Unified", 3, CacheCounts[3]}};
   for (auto& C : Cases) {
     int val;
     if (!GetSysctl(C.name, &val)) continue;
     CPUInfo::CacheInfo info;