fixup! [Pass, SCCP] Support constant structure in PhiNode

Author: aokblast

llvm/lib/Transforms/Utils/SCCPSolver.cpp

@@ -761,7 +761,7 @@ class SCCPInstVisitor : public InstVisitor<SCCPInstVisitor> {
   void handleCallArguments(CallBase &CB);
   void handleExtractOfWithOverflow(ExtractValueInst &EVI,
                                    const WithOverflowInst *WO, unsigned Idx);
-  bool isInstOverDefined(Instruction &Inst);
+  bool isInstFullyOverDefined(Instruction &Inst);
 
 private:
   friend class InstVisitor<SCCPInstVisitor>;
@@ -1381,7 +1381,7 @@ void SCCPInstVisitor::visitPHINode(PHINode &PN) {
   if (PN.getNumIncomingValues() > 64)
     return (void)markOverdefined(&PN);
 
-  if (isInstOverDefined(PN))
+  if (isInstFullyOverDefined(PN))
     return;
   SmallVector<unsigned> FeasibleIncomingIndices;
   for (unsigned i = 0, e = PN.getNumIncomingValues(); i != e; ++i) {
@@ -2146,7 +2146,7 @@ void SCCPInstVisitor::handleCallResult(CallBase &CB) {
   }
 }
 
-bool SCCPInstVisitor::isInstOverDefined(Instruction &Inst) {
+bool SCCPInstVisitor::isInstFullyOverDefined(Instruction &Inst) {
   // For structure Type, we handle each member separately.
   // A structure object won't be considered as overdefined when
   // there is at least one member that is not overdefined.

llvm/test/Transforms/SCCP/constant-range-struct.ll

@@ -160,7 +160,6 @@ define void @struct2_caller() {
 
 %"phi_type" =  type {i64, i64}
 
-; Function Attrs: mustprogress
 define internal %"phi_type" @test(i32 %input) {
 ; CHECK-LABEL: @test(
 ; CHECK-NEXT:    br label [[COND_TRUE_I:%.*]]