From d529467afbfdd646510155569eef0ab0172d1435 Mon Sep 17 00:00:00 2001 From: Jakub Kuderski Date: Thu, 13 Jul 2017 21:52:56 +0000 Subject: [PATCH] [Dominators] Rename Update.Arc to Update.Edge Update.Arc of type Arc caused a warning on some buildbots. llvm-svn: 307968 --- llvm/unittests/IR/CFGBuilder.cpp | 12 ++++++------ llvm/unittests/IR/CFGBuilder.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/llvm/unittests/IR/CFGBuilder.cpp b/llvm/unittests/IR/CFGBuilder.cpp index 89e52b1465c9..a0b9b0e6cf4a 100644 --- a/llvm/unittests/IR/CFGBuilder.cpp +++ b/llvm/unittests/IR/CFGBuilder.cpp @@ -144,9 +144,9 @@ Optional CFGBuilder::applyUpdate() { return None; Update NextUpdate = Updates[UpdateIdx++]; if (NextUpdate.Action == ActionKind::Insert) - connect(NextUpdate.Arc); + connect(NextUpdate.Edge); else - disconnect(NextUpdate.Arc); + disconnect(NextUpdate.Edge); return NextUpdate; } @@ -161,8 +161,8 @@ void CFGBuilder::dump(raw_ostream &OS) const { i = 0; for (const auto &U : Updates) { OS << (i + 1 == UpdateIdx ? "->" : " ") << i - << ((U.Action == ActionKind::Insert) ? "\tIns " : "\tDel ") << U.Arc.From - << " -> " << U.Arc.To << "\n"; + << ((U.Action == ActionKind::Insert) ? "\tIns " : "\tDel ") + << U.Edge.From << " -> " << U.Edge.To << "\n"; ++i; } } @@ -237,8 +237,8 @@ TEST(CFGBuilder, Deletions) { EXPECT_TRUE(UpdateC); EXPECT_EQ(UpdateC->Action, CFGBuilder::ActionKind::Delete); - EXPECT_EQ(UpdateC->Arc.From, "c"); - EXPECT_EQ(UpdateC->Arc.To, "d"); + EXPECT_EQ(UpdateC->Edge.From, "c"); + EXPECT_EQ(UpdateC->Edge.To, "d"); EXPECT_TRUE(isa(B.getOrAddBlock("c")->getTerminator())); size_t i = 1; diff --git a/llvm/unittests/IR/CFGBuilder.h b/llvm/unittests/IR/CFGBuilder.h index 38521e2a7d9f..b6a27326f53c 100644 --- a/llvm/unittests/IR/CFGBuilder.h +++ b/llvm/unittests/IR/CFGBuilder.h @@ -62,7 +62,7 @@ public: enum class ActionKind { Insert, Delete }; struct Update { ActionKind Action; - Arc Arc; + Arc Edge; }; CFGBuilder(Function *F, const std::vector &InitialArcs,