diff options
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 1bd9fd0f3de..922947a6e70 100644 --- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -4665,10 +4665,9 @@ const Optional<ByteProvider> calculateByteProvider(SDValue Op, unsigned Index, if (LHS->isConstantZero()) return RHS; - else if (RHS->isConstantZero()) + if (RHS->isConstantZero()) return LHS; - else - return None; + return None; } case ISD::SHL: { auto ShiftOp = dyn_cast<ConstantSDNode>(Op->getOperand(1)); @@ -4698,8 +4697,7 @@ const Optional<ByteProvider> calculateByteProvider(SDValue Op, unsigned Index, return Op.getOpcode() == ISD::ZERO_EXTEND ? Optional<ByteProvider>(ByteProvider::getConstantZero()) : None; - else - return calculateByteProvider(NarrowOp, Index, Depth + 1); + return calculateByteProvider(NarrowOp, Index, Depth + 1); } case ISD::BSWAP: return calculateByteProvider(Op->getOperand(0), ByteWidth - Index - 1, @@ -4718,8 +4716,7 @@ const Optional<ByteProvider> calculateByteProvider(SDValue Op, unsigned Index, return L->getExtensionType() == ISD::ZEXTLOAD ? Optional<ByteProvider>(ByteProvider::getConstantZero()) : None; - else - return ByteProvider::getMemory(L, Index); + return ByteProvider::getMemory(L, Index); } } |
