[llvm-commits] [polly] r150337 - in /polly/trunk: lib/CodeGeneration.cpp test/CodeGen/split_edges_2.ll

[Tobias Grosser]

Author: grosser
Date: Sun Feb 12 06:09:46 2012
New Revision: 150337

URL: http://llvm.org/viewvc/llvm-project?rev=150337&view=rev
Log:
CodeGen: Always name merge block

Modified:
    polly/trunk/lib/CodeGeneration.cpp
    polly/trunk/test/CodeGen/split_edges_2.ll

Modified: polly/trunk/lib/CodeGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGeneration.cpp?rev=150337&r1=150336&r2=150337&view=diff
==============================================================================
--- polly/trunk/lib/CodeGeneration.cpp (original)
+++ polly/trunk/lib/CodeGeneration.cpp Sun Feb 12 06:09:46 2012
@@ -1667,11 +1667,11 @@
       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);

Modified: polly/trunk/test/CodeGen/split_edges_2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/CodeGen/split_edges_2.ll?rev=150337&r1=150336&r2=150337&view=diff
==============================================================================
--- polly/trunk/test/CodeGen/split_edges_2.ll (original)
+++ polly/trunk/test/CodeGen/split_edges_2.ll Sun Feb 12 06:09:46 2012
@@ -27,7 +27,7 @@
 }
 
 ; CHECK: polly.split_new_and_old
-; CHECK-NOT: polly.merge_new_and_old
+; CHECK: polly.merge_new_and_old