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 isInstUnderDefined(Instruction &Inst);
+  bool isInstOverDefined(Instruction &Inst);
 
 private:
   friend class InstVisitor<SCCPInstVisitor>;
@@ -1381,9 +1381,9 @@ void SCCPInstVisitor::visitPHINode(PHINode &PN) {
   if (PN.getNumIncomingValues() > 64)
     return (void)markOverdefined(&PN);
 
-  if (isInstUnderDefined(PN))
+  if (isInstOverDefined(PN))
     return;
-  llvm::SmallVector<unsigned> FeasibleIncomingIndices;
+  SmallVector<unsigned> FeasibleIncomingIndices;
   for (unsigned i = 0, e = PN.getNumIncomingValues(); i != e; ++i) {
     if (!isEdgeFeasible(PN.getIncomingBlock(i), PN.getParent()))
       continue;
@@ -2146,10 +2146,10 @@ void SCCPInstVisitor::handleCallResult(CallBase &CB) {
   }
 }
 
-bool SCCPInstVisitor::isInstUnderDefined(Instruction &Inst) {
-  // For structure Type, we handle each member seperately.
-  // A structure object won't be considered as overDefined when
-  // there is at least one member can become constant.
+bool SCCPInstVisitor::isInstOverDefined(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.
   if (StructType *STy = dyn_cast<StructType>(Inst.getType())) {
     for (unsigned i = 0, e = STy->getNumElements(); i < e; ++i) {
       if (!getStructValueState(&Inst, i).isOverdefined())

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

@@ -161,7 +161,7 @@ define void @struct2_caller() {
 %"phi_type" =  type {i64, i64}
 
 ; Function Attrs: mustprogress
-define internal noundef %"phi_type" @test(i32 noundef %input) local_unnamed_addr readnone nounwind {
+define internal %"phi_type" @test(i32 %input) {
 ; CHECK-LABEL: @test(
 ; CHECK-NEXT:    br label [[COND_TRUE_I:%.*]]
 ; CHECK:       cond.true.i:
@@ -187,7 +187,7 @@ cond.end.i:
   ret %"phi_type" %retval
 }
 
-define dso_local noundef %"phi_type" @test2() {
+define %"phi_type" @test2() {
 ; CHECK-LABEL: @test2(
 ; CHECK-NEXT:    [[CALL_1:%.*]] = tail call fastcc [[PHI_TYPE:%.*]] @[[TEST:[a-zA-Z0-9_$\"\\.-]*[a-zA-Z_$\"\\.-][a-zA-Z0-9_$\"\\.-]*]](i32 noundef 1)
 ; CHECK-NEXT:    ret [[PHI_TYPE]] { i64 1, i64 2 }