From 8518bbe39fa4e130a9cfeb299506497bb640309b Mon Sep 17 00:00:00 2001 From: Tobias Grosser Date: Sun, 12 Feb 2012 12:09:46 +0000 Subject: [PATCH] CodeGen: Always name merge block llvm-svn: 150337 --- polly/lib/CodeGeneration.cpp | 2 +- polly/test/CodeGen/split_edges_2.ll | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/polly/lib/CodeGeneration.cpp b/polly/lib/CodeGeneration.cpp index fe5ad740d951..eb5d63f0ca6d 100644 --- a/polly/lib/CodeGeneration.cpp +++ b/polly/lib/CodeGeneration.cpp @@ -1667,11 +1667,11 @@ class CodeGeneration : public ScopPass { MergeBlock = SplitEdge(R->getExitingBlock(), R->getExit(), this); // SplitEdge will never split R->getExit(), as R->getExit() has more than // one predecessor. Hence, mergeBlock is always a newly generated block. - MergeBlock->setName("polly.merge_new_and_old"); R->replaceExit(MergeBlock); } Builder->CreateBr(MergeBlock); + MergeBlock->setName("polly.merge_new_and_old"); if (DT->dominates(SplitBlock, MergeBlock)) DT->changeImmediateDominator(MergeBlock, SplitBlock); diff --git a/polly/test/CodeGen/split_edges_2.ll b/polly/test/CodeGen/split_edges_2.ll index a350c28d2eb4..79157867c103 100644 --- a/polly/test/CodeGen/split_edges_2.ll +++ b/polly/test/CodeGen/split_edges_2.ll @@ -27,7 +27,7 @@ bb5: } ; CHECK: polly.split_new_and_old -; CHECK-NOT: polly.merge_new_and_old +; CHECK: polly.merge_new_and_old