diff options
author | Eli Friedman <eli.friedman@gmail.com> | 2011-08-17 18:10:43 +0000 |
---|---|---|
committer | Eli Friedman <eli.friedman@gmail.com> | 2011-08-17 18:10:43 +0000 |
commit | 447f95202a1447ead4602f74405bc1bab6aa6d87 (patch) | |
tree | 050534cf5f399c940ade22fa150884417c61c4c9 /lib/Transforms/Scalar/SCCP.cpp | |
parent | 358499ea3b72dda4392d340ee5a36d1bbe76728c (diff) | |
download | llvm-447f95202a1447ead4602f74405bc1bab6aa6d87.tar.gz llvm-447f95202a1447ead4602f74405bc1bab6aa6d87.tar.bz2 llvm-447f95202a1447ead4602f74405bc1bab6aa6d87.tar.xz |
Silly mistake from r137777; restore significant isStructTy() checks. While here, be a bit more defensive
with unknown instructions.
Fixes PR10687.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@137836 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Scalar/SCCP.cpp')
-rw-r--r-- | lib/Transforms/Scalar/SCCP.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp index 48c8d90c62..cfe750c5fa 100644 --- 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: |