diff options
author | Jonas Devlieghere <jonas@devlieghere.com> | 2019-08-15 03:02:57 +0000 |
---|---|---|
committer | Jonas Devlieghere <jonas@devlieghere.com> | 2019-08-15 03:02:57 +0000 |
commit | 91697db2cd12df57c386216ce7885a2945596352 (patch) | |
tree | e48ba5cd5c964107d8ee6825f244c4d399cc9f77 /lib/xray | |
parent | 25eb4e4a498f0ecb0f1d54a3612be7f2801584dd (diff) | |
download | compiler-rt-91697db2cd12df57c386216ce7885a2945596352.tar.gz |
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.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@368952 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/xray')
-rw-r--r-- | lib/xray/tests/unit/fdr_controller_test.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/xray/tests/unit/fdr_controller_test.cpp b/lib/xray/tests/unit/fdr_controller_test.cpp index 3cf400786..f4808e42e 100644 --- a/lib/xray/tests/unit/fdr_controller_test.cpp +++ b/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); } }; |