commit 4eb9bf7c74620237937f9bccfad08cffb9dd9ba6
author Siva Chandra Reddy <sivachandra@google.com> Tue Apr 28 14:00:12 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Sun Aug 30 14:16:54 2020 -0700
tree b958751df38fae452dbe72e10cf07e346ae13e3b
parent 1c392ab6f079d38dcb752fc69aeead6e81a315dc

[libc] Fix benchmarks build.

Reviewers: gchatelet, echristo

Subscribers: mgorny, tschuett, libc-commits

Tags: #libc-project

Differential Revision: https://reviews.llvm.org/D79040

GitOrigin-RevId: 1852af16a1c52e5d61e30a43ed74a446514152fc

utils/benchmarks/CMakeLists.txt

diff --git a/utils/benchmarks/CMakeLists.txt b/utils/benchmarks/CMakeLists.txt
index d5926d6..49eba9b 100644
--- a/utils/benchmarks/CMakeLists.txt
+++ b/utils/benchmarks/CMakeLists.txt
@@ -24,6 +24,7 @@
         -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
         -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
         -DCMAKE_CXX_FLAGS:STRING=${GOOGLE_BENCHMARK_TARGET_FLAGS}
+        -DCMAKE_CXX_STANDARD:STRING=14
         -DCMAKE_BUILD_TYPE:STRING=RELEASE
         -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
         -DBENCHMARK_ENABLE_TESTING:BOOL=OFF)

utils/benchmarks/JSON.cpp

diff --git a/utils/benchmarks/JSON.cpp b/utils/benchmarks/JSON.cpp
index 175aa22..2f37041 100644
--- a/utils/benchmarks/JSON.cpp
+++ b/utils/benchmarks/JSON.cpp
@@ -17,9 +17,11 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/JSON.h"
 #include "llvm/Support/MathExtras.h"
+
 #include <chrono>
 #include <limits>
 #include <memory>
+#include <string>
 #include <vector>
 
 namespace llvm {
@@ -48,7 +50,7 @@
 
 static Error fromJson(const json::Value &V, std::string &Out) {
   if (auto S = V.getAsString()) {
-    Out = *S;
+    Out = std::string(*S);
     return Error::success();
   }
   return createStringError(errc::io_error, "Can't parse String");

utils/benchmarks/LibcMemoryBenchmarkMain.cpp

diff --git a/utils/benchmarks/LibcMemoryBenchmarkMain.cpp b/utils/benchmarks/LibcMemoryBenchmarkMain.cpp
index e305971..79774c3 100644
--- a/utils/benchmarks/LibcMemoryBenchmarkMain.cpp
+++ b/utils/benchmarks/LibcMemoryBenchmarkMain.cpp
@@ -17,6 +17,8 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"
 
+#include <string>
+
 namespace llvm {
 namespace libc_benchmarks {
 
@@ -61,7 +63,7 @@
   size_t Steps = 0;
   for (auto FunctionName : Runner->getFunctionNames()) {
     FunctionMeasurements FM;
-    FM.Name = FunctionName;
+    FM.Name = std::string(FunctionName);
     for (size_t Run = 0; Run < Runs; ++Run) {
       for (uint32_t Size = SR.From; Size <= SR.To; Size += SR.Step) {
         const auto Result = Runner->benchmark(S.Options, FunctionName, Size);