PHINode::hasConstantValue(): return undef if the PHI is fully recursive.

Thanks Duncan for the idea

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

diff --git a/lib/Analysis/ValueTracking.cpp b/lib/Analysis/ValueTracking.cpp
index d245783ec6529b75095eef4e166f844ee50c8626..cea34e16e7bf4527e883b0dc192e6da1b98a7af8 100644 (file)
--- a/lib/Analysis/ValueTracking.cpp
+++ b/lib/Analysis/ValueTracking.cpp
@@ -694,7 +694,7 @@ void llvm::ComputeMaskedBits(Value *V, APInt &KnownZero, APInt &KnownOne,
     // taking conservative care to avoid excessive recursion.
     if (Depth < MaxDepth - 1 && !KnownZero && !KnownOne) {
       // Skip if every incoming value references to ourself.
-      if (P->hasConstantValue() == P)
+      if (dyn_cast_or_null<UndefValue>(P->hasConstantValue()))
         break;
 
       KnownZero = APInt::getAllOnesValue(BitWidth);

diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp
index 5aef45925016800734005972beb968ee19ae2721..9af98e8a9b3d139c248f8de23c3b3f7c8aec656c 100644 (file)
--- a/lib/VMCore/Instructions.cpp
+++ b/lib/VMCore/Instructions.cpp
@@ -167,6 +167,8 @@ Value *PHINode::hasConstantValue() const {
        // The case where the first value is this PHI.
       ConstantValue = getIncomingValue(i);
     }
+  if (ConstantValue == this)
+    return UndefValue::get(getType());
   return ConstantValue;
 }