11 files changed, 31 insertions, 113 deletions
diff --git a/llvm/test/Analysis/PostDominators/pr24415.ll b/llvm/test/Analysis/PostDominators/pr24415.ll
deleted file mode 100644
index e71c33bacf6..00000000000
--- a/llvm/test/Analysis/PostDominators/pr24415.ll
+++ /dev/null
@@ -1,18 +0,0 @@
-; RUN: opt < %s -postdomtree -analyze | FileCheck %s
-; RUN: opt < %s -passes='print<postdomtree>' 2>&1 | FileCheck %s
-
-; Function Attrs: nounwind ssp uwtable
-define void @foo() {
-  br label %1
-
-; <label>:1                                       ; preds = %0, %1
-  br label %1
-                                                  ; No predecessors!
-  ret void
-}
-
-; CHECK: Inorder PostDominator Tree: 
-; CHECK-NEXT:   [1]  <<exit node>> {0,7}
-; CHECK-NEXT:     [2] %2 {1,2}
-; CHECK-NEXT:     [2] %1 {3,6}
-; CHECK-NEXT:       [3] %0 {4,5}
diff --git a/llvm/test/Analysis/PostDominators/pr6047_a.ll b/llvm/test/Analysis/PostDominators/pr6047_a.ll
index 05f87125025..ec1455b46fe 100644
--- a/llvm/test/Analysis/PostDominators/pr6047_a.ll
+++ b/llvm/test/Analysis/PostDominators/pr6047_a.ll
@@ -12,9 +12,4 @@ bb35.loopexit3:
 bb35:
   ret void
 }
-;CHECK:Inorder PostDominator Tree: 
-;CHECK-NEXT:  [1]  <<exit node>> {0,9}
-;CHECK-NEXT:    [2] %bb35 {1,4}
-;CHECK-NEXT:      [3] %bb35.loopexit3 {2,3}
-;CHECK-NEXT:    [2] %entry {5,6}
-;CHECK-NEXT:    [2] %bb3.i {7,8}
+; CHECK: [3] %entry
diff --git a/llvm/test/Analysis/PostDominators/pr6047_b.ll b/llvm/test/Analysis/PostDominators/pr6047_b.ll
index f5ff754fa65..7bd2c86b737 100644
--- a/llvm/test/Analysis/PostDominators/pr6047_b.ll
+++ b/llvm/test/Analysis/PostDominators/pr6047_b.ll
@@ -16,10 +16,4 @@ bb35.loopexit3:
 bb35:
   ret void
 }
-; CHECK: Inorder PostDominator Tree: 
-; CHECK-NEXT:   [1]  <<exit node>> {0,11}
-; CHECK-NEXT:     [2] %bb35 {1,4}
-; CHECK-NEXT:       [3] %bb35.loopexit3 {2,3}
-; CHECK-NEXT:     [2] %a {5,6}
-; CHECK-NEXT:     [2] %entry {7,8}
-; CHECK-NEXT:     [2] %bb3.i {9,10}
+; CHECK: [4] %entry
diff --git a/llvm/test/Analysis/PostDominators/pr6047_c.ll b/llvm/test/Analysis/PostDominators/pr6047_c.ll
index 24a7f1ae562..08c9551f156 100644
--- a/llvm/test/Analysis/PostDominators/pr6047_c.ll
+++ b/llvm/test/Analysis/PostDominators/pr6047_c.ll
@@ -144,53 +144,4 @@ bb35.loopexit3:
 bb35:
   ret void
 }
-; CHECK: Inorder PostDominator Tree: 
-; CHECK-NEXT:   [1]  <<exit node>> {0,97}
-; CHECK-NEXT:     [2] %bb35 {1,92}
-; CHECK-NEXT:       [3] %bb35.loopexit3 {2,3}
-; CHECK-NEXT:       [3] %bb35.loopexit {4,5}
-; CHECK-NEXT:       [3] %bb31 {6,7}
-; CHECK-NEXT:       [3] %bb30 {8,9}
-; CHECK-NEXT:       [3] %bb30.loopexit1 {10,11}
-; CHECK-NEXT:       [3] %bb30.loopexit {12,13}
-; CHECK-NEXT:       [3] %bb23 {14,15}
-; CHECK-NEXT:       [3] %bb23.us {16,17}
-; CHECK-NEXT:       [3] %bb23.preheader {18,19}
-; CHECK-NEXT:       [3] %bb23.us.preheader {20,21}
-; CHECK-NEXT:       [3] %bb.nph {22,23}
-; CHECK-NEXT:       [3] %bb29.preheader {24,25}
-; CHECK-NEXT:       [3] %bb20 {26,27}
-; CHECK-NEXT:       [3] %bb19 {28,29}
-; CHECK-NEXT:       [3] %bb.nph14 {30,31}
-; CHECK-NEXT:       [3] %bb17.loopexit.split {32,33}
-; CHECK-NEXT:       [3] %bb16 {34,35}
-; CHECK-NEXT:       [3] %bb15 {36,37}
-; CHECK-NEXT:       [3] %bb15.loopexit2 {38,39}
-; CHECK-NEXT:       [3] %bb15.loopexit {40,41}
-; CHECK-NEXT:       [3] %bb8 {42,43}
-; CHECK-NEXT:       [3] %bb8.us {44,45}
-; CHECK-NEXT:       [3] %bb8.preheader {46,47}
-; CHECK-NEXT:       [3] %bb8.us.preheader {48,49}
-; CHECK-NEXT:       [3] %bb.nph18 {50,51}
-; CHECK-NEXT:       [3] %bb14.preheader {52,53}
-; CHECK-NEXT:       [3] %bb5 {54,55}
-; CHECK-NEXT:       [3] %bb4 {56,57}
-; CHECK-NEXT:       [3] %bb.nph21 {58,59}
-; CHECK-NEXT:       [3] %bb3.i.loopexit.us {60,61}
-; CHECK-NEXT:       [3] %bb8.i.us {62,63}
-; CHECK-NEXT:       [3] %bb4.i.us {64,65}
-; CHECK-NEXT:       [3] %bb6.i.us {66,67}
-; CHECK-NEXT:       [3] %bb1.i.us {68,69}
-; CHECK-NEXT:       [3] %bb.i4.us.backedge {70,71}
-; CHECK-NEXT:       [3] %bb7.i.us {72,73}
-; CHECK-NEXT:       [3] %bb.i4.us {74,75}
-; CHECK-NEXT:       [3] %bb3.split.us {76,77}
-; CHECK-NEXT:       [3] %bb3 {78,79}
-; CHECK-NEXT:       [3] %bb32.preheader {80,81}
-; CHECK-NEXT:       [3] %_float32_unpack.exit8 {82,83}
-; CHECK-NEXT:       [3] %bb.i5 {84,85}
-; CHECK-NEXT:       [3] %_float32_unpack.exit {86,87}
-; CHECK-NEXT:       [3] %bb.i {88,89}
-; CHECK-NEXT:       [3] %bb {90,91}
-; CHECK-NEXT:     [2] %entry {93,94}
-; CHECK-NEXT:     [2] %bb3.i {95,96}
+; CHECK: [3] %entry
diff --git a/llvm/test/Analysis/PostDominators/pr6047_d.ll b/llvm/test/Analysis/PostDominators/pr6047_d.ll
index a3e9f16903c..4cfa88029ae 100644
--- a/llvm/test/Analysis/PostDominators/pr6047_d.ll
+++ b/llvm/test/Analysis/PostDominators/pr6047_d.ll
@@ -21,12 +21,4 @@ bb35.loopexit3:
 bb35:
   ret void
 }
-; CHECK: Inorder PostDominator Tree: 
-; CHECK-NEXT:   [1]  <<exit node>> {0,15}
-; CHECK-NEXT:     [2] %bb35 {1,4}
-; CHECK-NEXT:       [3] %bb35.loopexit3 {2,3}
-; CHECK-NEXT:     [2] %c {5,12}
-; CHECK-NEXT:       [3] %b {6,7}
-; CHECK-NEXT:       [3] %entry {8,9}
-; CHECK-NEXT:       [3] %a {10,11}
-; CHECK-NEXT:     [2] %bb3.i {13,14}
+; CHECK: [4] %entry
diff --git a/llvm/test/Analysis/RegionInfo/infinite_loop.ll b/llvm/test/Analysis/RegionInfo/infinite_loop.ll
index 06ab6cc7481..61abef8ff7a 100644
--- a/llvm/test/Analysis/RegionInfo/infinite_loop.ll
+++ b/llvm/test/Analysis/RegionInfo/infinite_loop.ll
@@ -16,4 +16,6 @@ define void @normal_condition() nounwind {
 }
 ; CHECK-NOT: =>
 ; CHECK: [0] 0 => <Function Return>
-; STAT: 1 region - The # of regions
+; CHECK: [1] 1 => 4
+; STAT: 2 region - The # of regions
+; STAT: 1 region - The # of simple regions
diff --git a/llvm/test/Analysis/RegionInfo/infinite_loop_2.ll b/llvm/test/Analysis/RegionInfo/infinite_loop_2.ll
index 6df5a9fe563..56e83cfdebb 100644
--- a/llvm/test/Analysis/RegionInfo/infinite_loop_2.ll
+++ b/llvm/test/Analysis/RegionInfo/infinite_loop_2.ll
@@ -26,11 +26,12 @@ define void @normal_condition() nounwind {
 }
 ; CHECK-NOT: =>
 ; CHECK: [0] 0 => <Function Return>
-; CHECK: [1] 5 => 6
+; CHECK: [1] 1 => 3
 ; STAT: 2 region - The # of regions
+; STAT: 1 region - The # of simple regions
 
-; BBIT:  0, 1, 2, 5, 11, 6, 12, 3, 4,
-; BBIT:  5, 11, 12,
+; BBIT: 0, 1, 2, 5, 11, 6, 12, 3, 4,
+; BBIT: 1, 2, 5, 11, 6, 12,
 
-; RNIT: 0, 1, 2, 5 => 6, 6, 3, 4,
-; RNIT: 5, 11, 12,
+; RNIT: 0, 1 => 3, 3, 4,
+; RNIT: 1, 2, 5, 11, 6, 12,
diff --git a/llvm/test/Analysis/RegionInfo/infinite_loop_3.ll b/llvm/test/Analysis/RegionInfo/infinite_loop_3.ll
index c1eda620c28..4538f0f7858 100644
--- a/llvm/test/Analysis/RegionInfo/infinite_loop_3.ll
+++ b/llvm/test/Analysis/RegionInfo/infinite_loop_3.ll
@@ -38,15 +38,16 @@ define void @normal_condition() nounwind {
 	ret void
 }
 ; CHECK-NOT: =>
-; CHECK:[0] 0 => <Function Return>
-; CHECK-NEXT:  [1] 5 => 6
-; CHECK-NEXT:  [1] 9 => 10
+; CHECK: [0] 0 => <Function Return>
+; CHECK-NEXT: [1] 1 => 3
+; CHECK-NEXT: [1] 7 => 1
 ; STAT: 3 region - The # of regions
+; STAT: 2 region - The # of simple regions
 
-; BBIT:  0, 7, 1, 2, 5, 11, 6, 12, 3, 4, 8, 9, 13, 10, 14, 
-; BBIT:  5, 11, 12, 
-; BBIT:  9, 13, 14, 
+; BBIT: 0, 7, 1, 2, 5, 11, 6, 12, 3, 4, 8, 9, 13, 10, 14,
+; BBIT: 7, 8, 9, 13, 10, 14,
+; BBIT: 1, 2, 5, 11, 6, 12,
 
-; RNIT:   0, 7, 1, 2, 5 => 6, 6, 3, 4, 8, 9 => 10, 10, 
-; RNIT:   5, 11, 12, 
-; RNIT:   9, 13, 14, 
+; RNIT: 0, 7 => 1, 1 => 3, 3, 4,
+; RNIT: 7, 8, 9, 13, 10, 14,
+; RNIT: 1, 2, 5, 11, 6, 12,
diff --git a/llvm/test/Analysis/RegionInfo/infinite_loop_4.ll b/llvm/test/Analysis/RegionInfo/infinite_loop_4.ll
index 7aca6d79da3..4ac9068f0dd 100644
--- a/llvm/test/Analysis/RegionInfo/infinite_loop_4.ll
+++ b/llvm/test/Analysis/RegionInfo/infinite_loop_4.ll
@@ -38,14 +38,12 @@ define void @normal_condition() nounwind {
 }
 ; CHECK-NOT: =>
 ; CHECK: [0] 0 => <Function Return>
-; CHECK-NEXT: [1] 2 => 10
-; CHECK_NEXT: [2] 5 => 6
-; STAT: 3 region - The # of regions
+; CHECK-NEXT: [1] 7 => 3
+; STAT: 2 region - The # of regions
 ; STAT: 1 region - The # of simple regions
 
 ; BBIT: 0, 7, 1, 2, 5, 11, 6, 10, 8, 9, 13, 14, 12, 3, 4,
-; BBIT: 2, 5, 11, 6, 12,
-; BBIT: 5, 11, 12,
-; RNIT: 0, 7, 1, 2 => 10, 10, 8, 9, 13, 14, 3, 4,
-; RNIT: 2, 5 => 6, 6,
-; RNIT: 5, 11, 12,
+; BBIT: 7, 1, 2, 5, 11, 6, 10, 8, 9, 13, 14, 12,
+
+; RNIT: 0, 7 => 3, 3, 4,
+; RNIT: 7, 1, 2, 5, 11, 6, 10, 8, 9, 13, 14, 12,
diff --git a/llvm/test/Analysis/RegionInfo/infinite_loop_5_a.ll b/llvm/test/Analysis/RegionInfo/infinite_loop_5_a.ll
index b0ffb9b8008..b0e52861b7c 100644
--- a/llvm/test/Analysis/RegionInfo/infinite_loop_5_a.ll
+++ b/llvm/test/Analysis/RegionInfo/infinite_loop_5_a.ll
@@ -19,5 +19,6 @@ define void @normal_condition() nounwind {
 
 ; CHECK:      Region tree:
 ; CHECK-NEXT: [0] 0 => <Function Return>
+; CHECK-NEXT:   [1] 7 => 3
 ; CHECK-NEXT: End region tree
 
diff --git a/llvm/test/Analysis/RegionInfo/infinite_loop_5_b.ll b/llvm/test/Analysis/RegionInfo/infinite_loop_5_b.ll
index 9759ea873c5..49580c9de3d 100644
--- a/llvm/test/Analysis/RegionInfo/infinite_loop_5_b.ll
+++ b/llvm/test/Analysis/RegionInfo/infinite_loop_5_b.ll
@@ -21,4 +21,5 @@ define void @normal_condition() nounwind {
 
 ; CHECK:      Region tree:
 ; CHECK-NEXT: [0] 0 => <Function Return>
+; CHECK-NEXT:   [1] 7 => 3
 ; CHECK-NEXT: End region tree