Silly mistake from r137777; restore significant isStructTy() checks. While here...

with unknown instructions.

Fixes PR10687.

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

diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp
index 48c8d90c62cd212ccb5b1d0cb7a38862a31a5c32..cfe750c5fa273a4aac0a357210664aec99072177 100644 (file)
--- a/lib/Transforms/Scalar/SCCP.cpp
+++ b/lib/Transforms/Scalar/SCCP.cpp
@@ -1436,7 +1436,7 @@ bool SCCPSolver::ResolvedUndefsIn(Function &F) {
         // Only a few things that can be structs matter for undef.  Just send
         // all their results to overdefined.  We could be more precise than this
         // but it isn't worth bothering.
-        if (isa<CallInst>(I) || isa<SelectInst>(I)) {
+        if (!isa<ExtractValueInst>(I) && !isa<InsertValueInst>(I)) {
           for (unsigned i = 0, e = STy->getNumElements(); i != e; ++i) {
             LatticeVal &LV = getStructValueState(I, i);
             if (LV.isUndefined())
@@ -1449,16 +1449,31 @@ bool SCCPSolver::ResolvedUndefsIn(Function &F) {
       LatticeVal &LV = getValueState(I);
       if (!LV.isUndefined()) continue;
 
+      // extractvalue is safe; check here because the argument is a struct.
+      if (isa<ExtractValueInst>(I))
+        continue;
+
+      // Compute the operand LatticeVals, for convenience below.
+      // Anything taking a struct is conservatively assumed to require
+      // overdefined markings.
+      if (I->getOperand(0)->getType()->isStructTy()) {
+        markOverdefined(I);
+        return true;
+      }
       LatticeVal Op0LV = getValueState(I->getOperand(0));
       LatticeVal Op1LV;
-      if (I->getNumOperands() == 2)
+      if (I->getNumOperands() == 2) {
+        if (I->getOperand(1)->getType()->isStructTy()) {
+          markOverdefined(I);
+          return true;
+        }
+
         Op1LV = getValueState(I->getOperand(1));
+      }
       // If this is an instructions whose result is defined even if the input is
       // not fully defined, propagate the information.
       Type *ITy = I->getType();
       switch (I->getOpcode()) {
-      case Instruction::ExtractValue:
-        break; // Extract of undef -> undef
       case Instruction::Add:
       case Instruction::Sub:
       case Instruction::Trunc:

diff --git a/test/Transforms/SCCP/undef-resolve.ll b/test/Transforms/SCCP/undef-resolve.ll
index e947d79ab659c9e0d055c64b415d73cf5969e151..a3dddb799a6a0ff08efe5fed7a59d68b35710d35 100644 (file)
--- a/test/Transforms/SCCP/undef-resolve.ll
+++ b/test/Transforms/SCCP/undef-resolve.ll
@@ -161,3 +161,12 @@ define i1 @test9() {
 ; CHECK: @test9
 ; CHECK: icmp ugt
 }
+
+; Make sure we handle extractvalue
+define i64 @test10() { 
+entry:
+  %e = extractvalue { i64, i64 } undef, 1
+  ret i64 %e
+; CHECK: @test10
+; CHECK: ret i64 undef
+}