From d65f37dbcc106bdfc37700b50f006337f2196a87 Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jonas@devlieghere.com>
Date: Thu, 15 Aug 2019 03:02:57 +0000
Subject: [PATCH] Revert "[compiler-rt] Migrate llvm::make_unique to
 std::make_unique"

The X-ray unit tests in compiler-rt are overriding the C++ version by
explicitly passing -std=c++11 in the compiler invocation. This poses a
problem as these tests are including LLVM headers that can now use C++14
features. I'm temporarily reverting this as I investigate the correct
solution.

llvm-svn: 368952
---
 .../xray/tests/unit/fdr_controller_test.cpp   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/compiler-rt/lib/xray/tests/unit/fdr_controller_test.cpp b/compiler-rt/lib/xray/tests/unit/fdr_controller_test.cpp
index 3cf400786d64..f4808e42e434 100644
--- a/compiler-rt/lib/xray/tests/unit/fdr_controller_test.cpp
+++ b/compiler-rt/lib/xray/tests/unit/fdr_controller_test.cpp
@@ -51,11 +51,11 @@ protected:
 public:
   void SetUp() override {
     bool Success;
-    BQ = std::make_unique<BufferQueue>(4096, 1, Success);
+    BQ = llvm::make_unique<BufferQueue>(4096, 1, Success);
     ASSERT_TRUE(Success);
     ASSERT_EQ(BQ->getBuffer(B), BufferQueue::ErrorCode::Ok);
-    W = std::make_unique<FDRLogWriter>(B);
-    C = std::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 0);
+    W = llvm::make_unique<FDRLogWriter>(B);
+    C = llvm::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 0);
   }
 };
 
@@ -103,7 +103,7 @@ TEST_F(FunctionSequenceTest, BoundaryFuncIdEncoding) {
 }
 
 TEST_F(FunctionSequenceTest, ThresholdsAreEnforced) {
-  C = std::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
+  C = llvm::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
   ASSERT_TRUE(C->functionEnter(1, 2, 3));
   ASSERT_TRUE(C->functionExit(1, 2, 3));
   ASSERT_TRUE(C->flush());
@@ -118,7 +118,7 @@ TEST_F(FunctionSequenceTest, ThresholdsAreEnforced) {
 }
 
 TEST_F(FunctionSequenceTest, ArgsAreHandledAndKept) {
-  C = std::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
+  C = llvm::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
   ASSERT_TRUE(C->functionEnterArg(1, 2, 3, 4));
   ASSERT_TRUE(C->functionExit(1, 2, 3));
   ASSERT_TRUE(C->flush());
@@ -138,7 +138,7 @@ TEST_F(FunctionSequenceTest, ArgsAreHandledAndKept) {
 }
 
 TEST_F(FunctionSequenceTest, PreservedCallsHaveCorrectTSC) {
-  C = std::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
+  C = llvm::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
   uint64_t TSC = 1;
   uint16_t CPU = 0;
   ASSERT_TRUE(C->functionEnter(1, TSC++, CPU));
@@ -163,7 +163,7 @@ TEST_F(FunctionSequenceTest, PreservedCallsHaveCorrectTSC) {
 }
 
 TEST_F(FunctionSequenceTest, PreservedCallsSupportLargeDeltas) {
-  C = std::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
+  C = llvm::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
   uint64_t TSC = 1;
   uint16_t CPU = 0;
   const auto LargeDelta = uint64_t{std::numeric_limits<int32_t>::max()};
@@ -187,7 +187,7 @@ TEST_F(FunctionSequenceTest, PreservedCallsSupportLargeDeltas) {
 }
 
 TEST_F(FunctionSequenceTest, RewindingMultipleCalls) {
-  C = std::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
+  C = llvm::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
 
   // First we construct an arbitrarily deep function enter/call stack.
   // We also ensure that we are in the same CPU.
@@ -214,7 +214,7 @@ TEST_F(FunctionSequenceTest, RewindingMultipleCalls) {
 }
 
 TEST_F(FunctionSequenceTest, RewindingIntermediaryTailExits) {
-  C = std::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
+  C = llvm::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
 
   // First we construct an arbitrarily deep function enter/call stack.
   // We also ensure that we are in the same CPU.
@@ -248,7 +248,7 @@ TEST_F(FunctionSequenceTest, RewindingIntermediaryTailExits) {
 }
 
 TEST_F(FunctionSequenceTest, RewindingAfterMigration) {
-  C = std::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
+  C = llvm::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 1000);
 
   // First we construct an arbitrarily deep function enter/call stack.
   // We also ensure that we are in the same CPU.
@@ -303,13 +303,13 @@ protected:
 public:
   void SetUp() override {
     bool Success;
-    BQ = std::make_unique<BufferQueue>(sizeof(MetadataRecord) * 5 +
+    BQ = llvm::make_unique<BufferQueue>(sizeof(MetadataRecord) * 5 +
                                             sizeof(FunctionRecord) * 2,
                                         kBuffers, Success);
     ASSERT_TRUE(Success);
     ASSERT_EQ(BQ->getBuffer(B), BufferQueue::ErrorCode::Ok);
-    W = std::make_unique<FDRLogWriter>(B);
-    C = std::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 0);
+    W = llvm::make_unique<FDRLogWriter>(B);
+    C = llvm::make_unique<FDRController<>>(BQ.get(), B, *W, clock_gettime, 0);
   }
 };
 
-- 
2.34.1