From: Chad Rosier <mcrosier@codeaurora.org>
Date: Wed, 25 Jan 2017 17:15:48 +0000 (+0000)
Subject: Revert "Do not verify dominator tree if it has no roots"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43cbae294612844eb42cf767f36bf9c5670f333f;p=llvm

Revert "Do not verify dominator tree if it has no roots"

This reverts commit r293033, per Danny's comment.  In short, we require
domtrees to have roots at all times.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@293075 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/MachineDominators.cpp b/lib/CodeGen/MachineDominators.cpp
index 4e348877697..303a6a9263b 100644
--- a/lib/CodeGen/MachineDominators.cpp
+++ b/lib/CodeGen/MachineDominators.cpp
@@ -143,10 +143,6 @@ void MachineDominatorTree::applySplitCriticalEdges() const {
 }
 
 void MachineDominatorTree::verifyDomTree() const {
-  if (getRoots().empty())
-    // If dominator tree is unavailable, skip verification.
-    return;
-
   MachineFunction &F = *getRoot()->getParent();
 
   MachineDominatorTree OtherDT;
diff --git a/lib/IR/Dominators.cpp b/lib/IR/Dominators.cpp
index 392670bbd29..44948cc5831 100644
--- a/lib/IR/Dominators.cpp
+++ b/lib/IR/Dominators.cpp
@@ -291,10 +291,6 @@ bool DominatorTree::isReachableFromEntry(const Use &U) const {
 }
 
 void DominatorTree::verifyDomTree() const {
-  if (getRoots().empty())
-    // If dominator tree is unavailable, skip verification.
-    return;
-
   Function &F = *getRoot()->getParent();
 
   DominatorTree OtherDT;
diff --git a/test/CodeGen/Generic/externally_available.ll b/test/CodeGen/Generic/externally_available.ll
index 2376bc73992..7976cc97188 100644
--- a/test/CodeGen/Generic/externally_available.ll
+++ b/test/CodeGen/Generic/externally_available.ll
@@ -1,4 +1,4 @@
-; RUN: llc -verify-machine-dom-info < %s | not grep test_
+; RUN: llc < %s | not grep test_
 
 ; test_function should not be emitted to the .s file.
 define available_externally i32 @test_function() {