diff options
Diffstat (limited to 'llvm/unittests/IR')
| -rw-r--r-- | llvm/unittests/IR/BasicBlockDbgInfoTest.cpp | 8 | ||||
| -rw-r--r-- | llvm/unittests/IR/MetadataTest.cpp | 16 |
2 files changed, 1 insertions, 23 deletions
diff --git a/llvm/unittests/IR/BasicBlockDbgInfoTest.cpp b/llvm/unittests/IR/BasicBlockDbgInfoTest.cpp index aac0f96..7780bba 100644 --- a/llvm/unittests/IR/BasicBlockDbgInfoTest.cpp +++ b/llvm/unittests/IR/BasicBlockDbgInfoTest.cpp @@ -189,11 +189,7 @@ TEST(BasicBlockDbgInfoTest, DropSourceAtomOnSplit) { ASSERT_TRUE(After); const DebugLoc &OrigTerminatorDL = After->getTerminator()->getDebugLoc(); ASSERT_TRUE(OrigTerminatorDL); -#ifdef EXPERIMENTAL_KEY_INSTRUCTIONS EXPECT_EQ(OrigTerminatorDL->getAtomGroup(), 1u); -#else - EXPECT_EQ(OrigTerminatorDL->getAtomGroup(), 0u); -#endif } // Test splitBasicBlock. @@ -204,11 +200,7 @@ TEST(BasicBlockDbgInfoTest, DropSourceAtomOnSplit) { const DebugLoc &OrigTerminatorDL = After->getTerminator()->getDebugLoc(); ASSERT_TRUE(OrigTerminatorDL); -#ifdef EXPERIMENTAL_KEY_INSTRUCTIONS EXPECT_EQ(OrigTerminatorDL->getAtomGroup(), 1u); -#else - EXPECT_EQ(OrigTerminatorDL->getAtomGroup(), 0u); -#endif BasicBlock *Before = After->getSinglePredecessor(); ASSERT_TRUE(Before); diff --git a/llvm/unittests/IR/MetadataTest.cpp b/llvm/unittests/IR/MetadataTest.cpp index ba8367f..7425703 100644 --- a/llvm/unittests/IR/MetadataTest.cpp +++ b/llvm/unittests/IR/MetadataTest.cpp @@ -1470,17 +1470,10 @@ TEST_F(DILocationTest, Merge) { PickMergedSourceLocations = false; } -#ifdef EXPERIMENTAL_KEY_INSTRUCTIONS #define EXPECT_ATOM(Loc, Group, Rank) \ EXPECT_EQ(Group, M->getAtomGroup()); \ EXPECT_EQ(Rank, M->getAtomRank()); -#else -#define EXPECT_ATOM(Loc, Group, Rank) \ - EXPECT_EQ(0u, M->getAtomGroup()); \ - EXPECT_EQ(0u, M->getAtomRank()); \ - (void)Group; \ - (void)Rank; -#endif + // Identical, including source atom numbers. { auto *A = DILocation::get(Context, 2, 7, N, nullptr, false, /*AtomGroup*/ 1, @@ -1753,15 +1746,8 @@ TEST_F(DILocationTest, KeyInstructions) { EXPECT_EQ(Context.pImpl->NextAtomGroup, 1u); DILocation *A1 = DILocation::get(Context, 1, 0, getSubprogram(), nullptr, false, 1, 2); - // The group is only applied to the DILocation if we've built LLVM with - // EXPERIMENTAL_KEY_INSTRUCTIONS. -#ifdef EXPERIMENTAL_KEY_INSTRUCTIONS EXPECT_EQ(A1->getAtomGroup(), 1u); EXPECT_EQ(A1->getAtomRank(), 2u); -#else - EXPECT_EQ(A1->getAtomGroup(), 0u); - EXPECT_EQ(A1->getAtomRank(), 0u); -#endif // Group number 1 has been "used" so next available is 2. EXPECT_EQ(Context.pImpl->NextAtomGroup, 2u); |